Changeset 3748

Timestamp:

08/31/08 21:12:35

Author:

robtaylor

Message:

Do unrefs in dispose, not finalise for tny-camel-folder and tny-camel-store-account.

Files:

• trunk/ChangeLog (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-folder.c (modified) (3 diffs)
• trunk/libtinymail-camel/tny-camel-store-account.c (modified) (4 diffs)

trunk/ChangeLog

@@ -190 +190 @@
-
-2008-06-20  Jose Dapena Paz  <jdapena@igalia.com>
-
-        * libtinymail-camel/tny-camel-folder.c:
-        Fix camel operation references
-
@@ -237 +235 @@
-        * libtinymail/Makefile.am:
-        Added stream cache implementation files.
+
+2008-06-12  Rob Taylor  <rob.taylor@codethink.co.uk>
+
+        * libtinymail-camel/tny-camel-folder.c:
+        * libtinymail-camel/tny-camel-store-account.c:
+        do unrefs in dispose, not finalise for tny-camel-folder and tny-camel-store-account.
-
-2008-06-10  Sergio Villar Senin  <svillar@igalia.com>

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

@@ -6046 +6046 @@
-
-static void
-finaliz
+dispos
-{
-        TnyCamelFolder *self = (TnyCamelFolder*) object;
-        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
-
-
-#ifdef DEBUG
-        g_print ("Finalizing TnyCamelFolder: %s\n", 
-                priv->folder_name?priv->folder_name:"(cleared)");
-
-        if (priv->reason_to_live != 0)
-                g_print ("Finalizing TnyCamelFolder, yet TnyHeader instances "
-                "are still alive: %d\n", priv->reason_to_live);
-#endif
-
-        if (priv->store)
@@ -6100 +6090 @@
-        }
-
+        if (G_LIKELY (priv->remove_strat))
+                g_object_unref (G_OBJECT (priv->remove_strat));
+        priv->remove_strat = NULL;
+
+        if (G_LIKELY (priv->receive_strat))
+                g_object_unref (G_OBJECT (priv->receive_strat));
+        priv->receive_strat = NULL;
+
+        priv->parent = NULL;
+
+        g_static_rec_mutex_unlock (priv->folder_lock);
+
+        return;
+}
+
+
+static void
+tny_camel_folder_finalize (GObject *object)
+{
+        TnyCamelFolder *self = (TnyCamelFolder*) object;
+        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
+
+
+#ifdef DEBUG
+        g_print ("Finalizing TnyCamelFolder: %s\n", 
+                priv->folder_name?priv->folder_name:"(cleared)");
+
+        if (priv->reason_to_live != 0)
+                g_print ("Finalizing TnyCamelFolder, yet TnyHeader instances "
+                "are still alive: %d\n", priv->reason_to_live);
+#endif
+
+        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 (G_LIKELY (priv->folder))
+        {
+                camel_object_unref (priv->folder);
+                priv->folder = NULL;
+        }
+
-        if (G_LIKELY (priv->cached_name))
-                g_free (priv->cached_name);
-        priv->cached_name = NULL;
-
-        if (G_LIKELY (priv->remove_strat))
-                g_object_unref (G_OBJECT (priv->remove_strat));
-        priv->remove_strat = NULL;
-
-        if (G_LIKELY (priv->receive_strat))
-                g_object_unref (G_OBJECT (priv->receive_strat));
-        priv->receive_strat = NULL;
-
-        priv->parent = NULL;
-
-        g_static_rec_mutex_unlock (priv->folder_lock);
@@ -6206 +6234 @@
-        parent_class = g_type_class_peek_parent (class);
-        object_class = (GObjectClass*) class;
+        object_class->dispose = tny_camel_folder_dispose;
-        object_class->finalize = tny_camel_folder_finalize;
-

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

@@ -799 +799 @@
-}
-
-
-
-
+
+
-{
-        TnyCamelStoreAccount *self = (TnyCamelStoreAccount *)object;
@@ -826 +825 @@
-        }
-
+        g_object_unref (priv->msg_queue);
+
+        return;
+}
+
+
+static void
+tny_camel_store_account_finalize (GObject *object)
+{
+        TnyCamelStoreAccount *self = (TnyCamelStoreAccount *)object;
+        TnyCamelStoreAccountPriv *priv = TNY_CAMEL_STORE_ACCOUNT_GET_PRIVATE (self);
+
-        /* g_static_rec_mutex_free (priv->factory_lock); */
-        g_free (priv->factory_lock);
@@ -833 +844 @@
-        g_free (priv->obs_lock);
-        priv->obs_lock = NULL;
-
-        g_object_unref (priv->msg_queue);
-
-        (*parent_class->finalize) (object);
@@ -2090 +2099 @@
-        object_class = (GObjectClass*) class;
-
+        object_class->dispose = tny_camel_store_account_dispose;
-        object_class->finalize = tny_camel_store_account_finalize;
-