Changeset 2926

Timestamp:

11/08/07 15:32:09

Author:

pvanhoof

Message:

Correctly unregistering when finalizing

Files:

• trunk/libtinymailui-gtk/tny-gtk-folder-store-tree-model.c (modified) (7 diffs)
• trunk/libtinymailui-gtk/tny-gtk-folder-store-tree-model.h (modified) (1 diff)

trunk/libtinymailui-gtk/tny-gtk-folder-store-tree-model.c

@@ -50 +50 @@
-        if (TNY_IS_FOLDER (folder)) {
-                tny_folder_add_observer (folder, TNY_FOLDER_OBSERVER (self));
+                self->fol_obs = g_list_prepend (self->fol_obs, folder);
-                g_object_unref (self);
-        }
@@ -59 +60 @@
-        if (TNY_IS_FOLDER_STORE (store)) {
-                tny_folder_store_add_observer (store, TNY_FOLDER_STORE_OBSERVER (self));
+                self->store_obs = g_list_prepend (self->store_obs, store);
-                g_object_unref (self);
-        }
@@ -64 +66 @@
-
-static void 
-
+, gboolean final
-{
-        if (TNY_IS_FOLDER (folder)) {
-                g_object_ref (self);
+                if (!final)
+                        self->fol_obs = g_list_remove (self->fol_obs, folder);
-                tny_folder_remove_observer (folder, TNY_FOLDER_OBSERVER (self));
-        }
@@ -73 +77 @@
-
-static void 
-
+, gboolean final
-{
-        if (TNY_IS_FOLDER_STORE (store)) {
-                g_object_ref (self);
+                if (!final)
+                        self->store_obs = g_list_remove (self->store_obs, store);
-                tny_folder_store_remove_observer (store, TNY_FOLDER_STORE_OBSERVER (self));
-        }
@@ -487 +493 @@
-{
-        TnyGtkFolderStoreTreeModel *me = (TnyGtkFolderStoreTreeModel*) object;
+        GList *copy = me->fol_obs;
+
+        while (copy) {
+                remove_folder_observer_weak (me, (TnyFolder *) copy->data, TRUE);
+                copy = g_list_next (copy);
+        }
+
+        copy = me->store_obs;
+        while (copy) {
+                remove_folder_store_observer_weak (me, (TnyFolderStore *) copy->data, TRUE);
+                copy = g_list_next (copy);
+        }
+
+        if (me->fol_obs)
+                g_list_free (me->fol_obs);
+        me->fol_obs = NULL;
+
+        if (me->store_obs)
+                g_list_free (me->store_obs);
+        me->store_obs = NULL;
-
-        g_mutex_lock (me->iterator_lock);
@@ -526 +552 @@
-        static GType types[] = { G_TYPE_STRING, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_INT, G_TYPE_OBJECT };
-
+        me->fol_obs = NULL;
+        me->store_obs = NULL;
-        me->iterator_lock = g_mutex_new ();
-
@@ -830 +858 @@
-                if (fol == folder) {
-
-
-
+, FALSE
+, FALSE
-
-                        gtk_tree_store_remove (GTK_TREE_STORE (model), iter);

trunk/libtinymailui-gtk/tny-gtk-folder-store-tree-model.h

@@ -58 +58 @@
-{
-        GtkTreeStore parent;
-
+, *store_obs, *fol_obs
-        GMutex *iterator_lock;
-        TnyFolderStoreQuery *query;