Changeset 3422

Timestamp:

02/19/08 00:29:07

Author:

pvanhoof

Message:

Small adaptations

Files:

• trunk/tests/functional/folder-lister.c (modified) (2 diffs)
• trunk/tests/shared/account-store.c (modified) (5 diffs)

trunk/tests/functional/folder-lister.c

@@ -19 +19 @@
-#include <stdlib.h>
-#include <glib.h>
+#include <gtk/gtk.h>
-
-#include <tny-list.h>
@@ -113 +114 @@
-                recurse_folders (TNY_FOLDER_STORE (account), NULL);
-
+        gtk_main();
+
-        g_object_unref (account);
-        g_object_unref (iter);

trunk/tests/shared/account-store.c

@@ -99 +99 @@
-}
-
+typedef struct {
+        GCond *condition;
+        GMutex *mutex;
+        gboolean had_callback;
+} SyncInfo;
+
+
+static void went_online (TnyCamelAccount *account, gboolean canceled, GError *err, gpointer user_data)
+{
+        SyncInfo *info = (SyncInfo *) user_data;
+
+        g_mutex_lock (info->mutex);
+        g_cond_broadcast (info->condition);
+        info->had_callback = TRUE;
+        g_mutex_unlock (info->mutex);
+
+        return; 
+}
-
-static void
@@ -116 +134 @@
-                tny_camel_account_set_session (TNY_CAMEL_ACCOUNT (account), me->session);
-                camel_session_set_online ((CamelSession*)me->session, me->force_online); 
-                tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (account), me->force_online, NULL, NULL);
-
-                tny_account_set_proto (account, "imap");
@@ -126 +143 @@
-                tny_account_set_pass_func (account, per_account_get_pass);
-
+                if (me->force_online) {
+                        SyncInfo *info = g_slice_new (SyncInfo);
+
+                        info->mutex = g_mutex_new ();
+                        info->condition = g_cond_new ();
+                        info->had_callback = FALSE;
+
+                        tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (account), me->force_online, went_online, info);
+
+                        g_mutex_lock (info->mutex);
+                        if (!info->had_callback)
+                                g_cond_wait (info->condition, info->mutex);
+                        g_mutex_unlock (info->mutex);
+
+                        g_mutex_free (info->mutex);
+                        g_cond_free (info->condition);
+                        g_slice_free (SyncInfo, info);
+                }
+
-                tny_list_prepend (list, (GObject*)account);
-                g_object_unref (G_OBJECT (account));
@@ -136 +172 @@
-                tny_camel_account_set_session (TNY_CAMEL_ACCOUNT (account), me->session);
-                camel_session_set_online ((CamelSession*)me->session, me->force_online); 
-                tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (account), me->force_online, NULL, NULL);
-
-                tny_account_set_proto (account, "something");
@@ -145 +180 @@
-                tny_account_set_forget_pass_func (account, per_account_forget_pass);
-                tny_account_set_pass_func (account, per_account_get_pass);
+
+                if (me->force_online) {
+                        SyncInfo *info = g_slice_new (SyncInfo);
+
+                        info->mutex = g_mutex_new ();
+                        info->condition = g_cond_new ();
+                        info->had_callback = FALSE;
+
+                        tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (account), me->force_online, went_online, info);
+
+                        g_mutex_lock (info->mutex);
+                        if (!info->had_callback)
+                                g_cond_wait (info->condition, info->mutex);
+                        g_mutex_unlock (info->mutex);
+
+                        g_mutex_free (info->mutex);
+                        g_cond_free (info->condition);
+                        g_slice_free (SyncInfo, info);
+                }
-
-                tny_list_prepend (list, (GObject*)account);