Changeset 3737

Timestamp:

08/18/08 15:45:41

Author:

svillar

Message:

Change in tny_camel_folder_finalize

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-folder.c (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2008-08-18  Sergio Villar Senin  <svillar@igalia.com>
+
+        * libtinymail-camel/tny-camel-folder.c (tny_camel_folder_finalize):
+        remove the folder from the account before unrefing it as it could be
+        the last reference of the account
+
-2008-08-12  Thomas Monjalon  <thomas.monjalon@openwide.fr>
-

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

@@ -6064 +6064 @@
-                camel_object_unref (priv->store);
-
+        if (priv->account && TNY_IS_CAMEL_STORE_ACCOUNT (priv->account)) {
+                TnyCamelStoreAccountPriv *apriv = TNY_CAMEL_STORE_ACCOUNT_GET_PRIVATE (priv->account);
+                g_static_rec_mutex_lock (apriv->factory_lock);
+                apriv->managed_folders = g_list_remove (apriv->managed_folders, self);
+                g_static_rec_mutex_unlock (apriv->factory_lock);
+        }
+
-#ifdef ACCOUNT_WEAK_REF
-        if (priv->account)
@@ -6079 +6086 @@
-        g_static_rec_mutex_lock (priv->folder_lock);
-        priv->dont_fkill = FALSE;
-
-        if (priv->account && TNY_IS_CAMEL_STORE_ACCOUNT (priv->account)) {
-                TnyCamelStoreAccountPriv *apriv = TNY_CAMEL_STORE_ACCOUNT_GET_PRIVATE (priv->account);
-                g_static_rec_mutex_lock (apriv->factory_lock);
-                apriv->managed_folders = g_list_remove (apriv->managed_folders, self);
-                g_static_rec_mutex_unlock (apriv->factory_lock);
-        }
-
-        if (!priv->iter_parented && priv->iter) {