Changeset 2310

Timestamp:

06/29/07 13:12:46

Author:

pvanhoof

Message:

Bugfix in the prepare method of TnyCamelTransportAccount

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-transport-account.c (modified) (3 diffs)

trunk/ChangeLog

@@ +1 @@
+2007-06-29  Philip Van Hoof  <pvanhoof@gnome.org>
+
+        * Bugfix in TnyCamelTransportAccount: rewrote the prepare method
+        implementation
+
-2007-06-29  Murray Cumming  <murrayc@murrayc.com>
-

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

@@ -66 +66 @@
-
-        g_static_rec_mutex_lock (apriv->service_lock);
-
-
-
+
+
+
+
+
+
+
+
+
-                if (camel_exception_is_set (apriv->ex))
-                        camel_exception_clear (apriv->ex);
-
-                if (apriv->service && CAMEL_IS_OBJECT (apriv->service))
-                        camel_object_unref (CAMEL_OBJECT (apriv->service));
-
-                apriv->service = camel_session_get_service
@@ -79 +82 @@
-                        apriv->type, apriv->ex);
-
-
+
+
-                        apriv->service->data = self;
+                        apriv->service->connecting = (con_op) NULL;
+                        apriv->service->disconnecting = (con_op) NULL;
+                        apriv->service->reconnecter = (con_op) NULL;
+                        apriv->service->reconnection = (con_op) NULL;
+
+                } else if (camel_exception_is_set (apriv->ex) && apriv->service)
+                {
+                        g_warning ("Must cleanup service pointer\n");
+                        apriv->service = NULL;
+                }
-
-        } else {
@@ -168 +182 @@
-        g_static_rec_mutex_lock (apriv->service_lock);
-        /* camel_service_connect can launch GUI things */
-
+
+
-        {
-                if (camel_exception_is_set (&ex))