Changeset 2453

Timestamp:

07/10/07 18:52:26

Author:

pvanhoof

Message:

Fixed a bug

Files:

• trunk/libtinymail-camel/tny-camel-account.c (modified) (2 diffs)
• trunk/libtinymail-camel/tny-session-camel-priv.h (modified) (1 diff)
• trunk/libtinymail-camel/tny-session-camel.c (modified) (2 diffs)

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

@@ -671 +671 @@
-        priv->session = session;
-
-
+_1
-
-        TNY_CAMEL_ACCOUNT_GET_CLASS (self)->prepare_func (self, FALSE, FALSE);
@@ -859 +859 @@
-        TNY_CAMEL_ACCOUNT_GET_CLASS (self)->prepare_func (TNY_CAMEL_ACCOUNT (self), 
-                reconf_if, TRUE);
+
+        if (priv->session)
+                _tny_session_camel_add_account_2 (priv->session, TNY_CAMEL_ACCOUNT (self));
-
-        g_static_rec_mutex_unlock (priv->service_lock);

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

@@ -22 +22 @@
-};
-
-
+
+
-void _tny_session_camel_forget_account (TnySessionCamel *self, TnyCamelAccount *account);
-void _tny_session_camel_reg_queue (TnySessionCamel *self, TnyCamelSendQueue *queue);

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

@@ -531 +531 @@
-
-void 
-
+_1
-{
-        TnyCamelAccountPriv *apriv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (account);
-        TnySessionCamelPriv *priv = self->priv;
-        gboolean doit = FALSE;
-
-        if (priv->initialized)
-        {
-                g_mutex_lock (priv->conlock);
-                doit = (priv->conthread == NULL);
-                g_mutex_unlock (priv->conlock);
-        }
-
-        if (apriv->cache_location)
@@ -548 +540 @@
-        apriv->cache_location = g_strdup (priv->camel_dir);
-        priv->current_accounts = g_list_prepend (priv->current_accounts, account);
+}
+
+void
+_tny_session_camel_add_account_2 (TnySessionCamel *self, TnyCamelAccount *account)
+{
+        TnyCamelAccountPriv *apriv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (account);
+        TnySessionCamelPriv *priv = self->priv;
+        gboolean doit = FALSE;
+
+        if (priv->initialized)
+        {
+                g_mutex_lock (priv->conlock);
+                doit = (priv->conthread == NULL);
+                g_mutex_unlock (priv->conlock);
+        }
-
-        if (priv->initialized && !priv->background_thread_running && doit)