Changeset 2444

Timestamp:

07/10/07 16:29:30

Author:

pvanhoof

Message:

Some major changes about the initialization and account-connecting behaviour

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-account.c (modified) (1 diff)
• trunk/libtinymail-camel/tny-session-camel-priv.h (modified) (1 diff)
• trunk/libtinymail-camel/tny-session-camel.c (modified) (13 diffs)
• trunk/libtinymail-camel/tny-session-camel.h (modified) (1 diff)
• trunk/libtinymail-gnome-desktop/tny-gnome-account-store.c (modified) (1 diff)
• trunk/libtinymail-gnome-desktop/tny-gnome-device.c (modified) (2 diffs)
• trunk/libtinymail-gpe/tny-gpe-account-store.c (modified) (1 diff)
• trunk/libtinymail-maemo/tny-maemo-account-store.c (modified) (1 diff)
• trunk/libtinymail-olpc/tny-olpc-account-store.c (modified) (1 diff)
• trunk/libtinymail/tny-account-store.c (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2007-07-10  Philip Van Hoof  <pvanhoof@gnome.org>
+
+        * Made the connecting of accounts more finegrained (once more)
+        * Introduced the required tny_session_camel_set_initialized API
+
+        * This was a major change in behaviour when connecting and at
+        initialization
+        * This was a major API change
+
-2007-07-10  Murray Cumming  <murrayc@murrayc.com>
-

trunk/libtinymail-camel/tny-camel-account.c

@@ -148 +148 @@
-                        camel_exception_clear (&ex);
-
-&
+apriv->
-                if (apriv->service->reconnection)
-                {
-&
+apriv->
-                                apriv->service->reconnection (apriv->service, TRUE, apriv->service->data);
-                        else

trunk/libtinymail-camel/tny-session-camel-priv.h

@@ -17 +17 @@
-        GMutex *conlock, *queue_lock;
-        GThread *conthread;
+        gboolean stop_now, initialized;
-        gboolean is_inuse, background_thread_running;
-        GList *regged_queues;

trunk/libtinymail-camel/tny-session-camel.c

@@ -113 +113 @@
-
-        if (cancel || retval == NULL) {
+
+                GError *err = NULL;
+
+                _tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (account), FALSE, &err);
+
+                if (err)
+                        g_error_free (err);
+
-                camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
-                        _("You cancelled when you had to enter a password"));
@@ -375 +383 @@
-        priv = instance->priv;
-
+        priv->initialized = FALSE;
+        priv->stop_now = FALSE;
-        priv->regged_queues = NULL;
-        priv->background_thread_running = FALSE;
@@ -394 +404 @@
-}
-
-void 
-_tny_session_camel_add_account (TnySessionCamel *self, TnyCamelAccount *account)
-{
-        TnyCamelAccountPriv *apriv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (account);
-        TnySessionCamelPriv *priv = self->priv;
-
-        if (apriv->cache_location)
-                g_free (apriv->cache_location);
-        apriv->cache_location = g_strdup (priv->camel_dir);
-
-        priv->current_accounts = g_list_prepend (priv->current_accounts, account);
-}
-
-void 
-_tny_session_camel_forget_account (TnySessionCamel *self, TnyCamelAccount *account)
-{
-        TnyCamelAccountPriv *apriv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (account);
-        TnySessionCamelPriv *priv = self->priv;
-
-        if (apriv->cache_location)
-                g_free (apriv->cache_location);
-        apriv->cache_location = NULL;
-
-        priv->current_accounts = g_list_remove (priv->current_accounts, account);
-
-        return;
-}
-
-typedef struct
-{
@@ -429 +411 @@
-        TnySessionCamelPriv *priv;
-} BackgroundConnectInfo;
+
+static gboolean
+background_connect_idle (gpointer data)
+{
+        BackgroundConnectInfo *info = data;
+        TnySessionCamel *self = info->user_data;
+        TnySessionCamelPriv *priv = self->priv;
+
+        if (priv->account_store)
+        {
+                g_signal_emit (priv->account_store, 
+                        tny_account_store_signals [TNY_ACCOUNT_STORE_ACCOUNTS_RELOADED], 0);
+                g_signal_emit (priv->account_store,
+                        tny_account_store_signals [TNY_ACCOUNT_STORE_CONNECTING_FINISHED], 0);
+        }
+
+        return FALSE;
+}
+
+
+
+static void
+background_connect_destroy (gpointer data)
+{
+        BackgroundConnectInfo *info = data;
+
+        g_object_unref (G_OBJECT (info->device));
+        g_slice_free (BackgroundConnectInfo, data);
+
+        return;
+}
+
+
-
-static void
@@ -455 +470 @@
-                apriv->is_connecting = TRUE;
-
-info->online
+FALSE /* info->online */
-
-                if (err == NULL)
@@ -480 +495 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-static gpointer 
@@ -524 +612 @@
-        priv->background_thread_running = TRUE;
-
-
-
-
-
+
+
-
-        priv->is_connecting = TRUE;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        priv->is_connecting = FALSE;
@@ -544 +641 @@
-        priv->prev_constat = info->online;
-
-        g_mutex_lock (priv->conlock);
-        priv->conthread = NULL;
-        g_mutex_unlock (priv->conlock);
-
-        priv->background_thread_running = FALSE;
+
+        priv->stop_now = FALSE;
-
-        g_thread_exit (NULL);
@@ -555 +651 @@
-
-static gboolean
-elayed
+o
-{
-        BackgroundConnectInfo *info = data;
+        TnySessionCamel *self = info->user_data;
+        TnySessionCamelPriv *priv = self->priv;
-
-        g_mutex_lock (info->priv->conlock);
@@ -567 +665 @@
-
-static void
-
+tny_session_camel_
-{
-        TnySessionCamel *self = user_data;
@@ -593 +691 @@
-
-
-
+
+
+
+
-                info->as_thread = TRUE;
-
-                g_mutex_lock (priv->conlock);
-
-
-
-
+
-                g_mutex_unlock (priv->conlock);
+
+                if (doit)
+                        do_background_connect_thread (info);
-
-        } else {
@@ -628 +729 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -673 +785 @@
-
-        priv->device = device;
-        priv->connchanged_signal = g_signal_connect (
-                        G_OBJECT (device), "connection_changed",
-                        G_CALLBACK (connection_changed), self);
-
-        if (tny_device_is_online (device) == FALSE)
-        {
-                priv->prev_constat = TRUE;
-                connection_changed (device, FALSE, self);
-        } else {
-                priv->prev_constat = FALSE;
-                camel_object_ref (self);
-                g_timeout_add (5000, after_one_second, self);
-        }
-
-        return;

trunk/libtinymail-camel/tny-session-camel.h

@@ -55 +55 @@
-void tny_session_camel_set_async_connecting (TnySessionCamel *self, gboolean enable);
-
+void tny_session_camel_set_initialized (TnySessionCamel *self);
+
-G_END_DECLS
-

trunk/libtinymail-gnome-desktop/tny-gnome-account-store.c

@@ -324 +324 @@
-                        g_free (proto);
-        }
+
+        tny_session_camel_set_initialized (priv->session);
-}
-

trunk/libtinymail-gnome-desktop/tny-gnome-device.c

@@ -167 +167 @@
-}
-
+/* #define IMMEDIATE_ONLINE_TEST */
-
-static void
@@ -177 +178 @@
-        priv->forced = FALSE;
-
+#ifdef IMMEDIATE_ONLINE_TEST
+        priv->fset = TRUE;
+        priv->forced = TRUE;
+#endif
+
-#ifdef GNOME
-        priv->invnm = FALSE;
-        priv->nm_ctx = libnm_glib_init ();
+#ifndef IMMEDIATE_ONLINE_TEST
-        priv->callback_id = libnm_glib_register_callback 
-                (priv->nm_ctx, nm_callback, self, NULL);
+#endif
-#endif
-

trunk/libtinymail-gpe/tny-gpe-account-store.c

@@ -323 +323 @@
-                if (mech)
-                        g_free (mech);
-
-
+
+
+
+
-}
-

trunk/libtinymail-maemo/tny-maemo-account-store.c

@@ -328 +328 @@
-                if (mech)
-                        g_free (mech);
-
-
+
+
+
-}
-

trunk/libtinymail-olpc/tny-olpc-account-store.c

@@ -280 +280 @@
-        }
-        g_dir_close (dir);
+
+        tny_session_camel_set_initialized (priv->session);
-}
-

trunk/libtinymail/tny-account-store.c

@@ -273 +273 @@
- * register the created accounts with a #TnySessionCamel instance using the 
- * libtinymail-camel specific tny_session_camel_set_current_accounts API.
+ *
+ * If you use the #TnySessionCamel to register accounts, you must after 
+ * registering your last initial account call the tny_session_camel_set_initialized
+ * API.
- *
- * The implementation must fillup @list with available accounts. Note that if
@@ -340 +344 @@
- *    }
- *    g_object_unref (G_OBJECT (iter));
+ *    tny_session_camel_set_initialized (session);
- * }
- * </programlisting></informalexample>