Changeset 3390

Timestamp:

02/09/08 17:11:54

Author:

pvanhoof

Message:

Fixed potential cyclic referencing

Files:

• trunk/libtinymailui-gtk/tny-gtk-folder-store-tree-model.c (modified) (5 diffs)

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

@@ -401 +401 @@
-} AccNotYetReadyInfo;
-
+static void 
+notify_signal_slots (gpointer user_data, GObject *instance)
+{
+        TnyGtkFolderStoreTreeModel *self = (TnyGtkFolderStoreTreeModel *) user_data;
+        int i=0;
+
+        for (i=0; i < self->signals->len; i++) {
+                SignalSlot *slot = (SignalSlot *) self->signals->pdata[i];
+                if (slot->instance == instance)
+                        slot->instance = NULL;
+        }
+}
+
-static gboolean
-account_was_not_yet_ready_idle (gpointer user_data)
@@ -412 +425 @@
-
-                slot = g_slice_new (SignalSlot);
-g_object_ref (info->account)
+(GObject *) info->account
-                slot->handler_id = g_signal_connect (info->account, "connection-status-changed",
-                        G_CALLBACK (tny_gtk_folder_store_tree_model_on_constatus_changed), info->self);
+                g_object_weak_ref (G_OBJECT (info->account), notify_signal_slots, info->self);
-                g_ptr_array_add (info->self->signals, slot);
-
-                slot = g_slice_new (SignalSlot);
-g_object_ref (info->account)
+(GObject *) info->account
-                slot->handler_id = g_signal_connect (info->account, "changed",
-                        G_CALLBACK (tny_gtk_folder_store_tree_model_on_changed), info->self);
+                g_object_weak_ref (G_OBJECT (info->account), notify_signal_slots, info->self);
-                g_ptr_array_add (info->self->signals, slot);
-
@@ -445 +460 @@
-        g_slice_free (AccNotYetReadyInfo, user_data);
-}
+
-
-static void
@@ -484 +500 @@
-
-                        slot = g_slice_new (SignalSlot);
-
+
+
-                        slot->handler_id = g_signal_connect (folder_store, "connection-status-changed",
-                                G_CALLBACK (tny_gtk_folder_store_tree_model_on_constatus_changed), self);
+                        g_object_weak_ref (G_OBJECT (folder_store), notify_signal_slots, self);
-                        g_ptr_array_add (self->signals, slot);
-
-                        slot = g_slice_new (SignalSlot);
-
+(GObject *)folder_store; //
-                        slot->handler_id = g_signal_connect (folder_store, "changed",
-                                G_CALLBACK (tny_gtk_folder_store_tree_model_on_changed), self);
+                        g_object_weak_ref (G_OBJECT (folder_store), notify_signal_slots, self);
-                        g_ptr_array_add (self->signals, slot);
-                }
@@ -551 +570 @@
-        for (i = 0; i < me->signals->len; i++) {
-                SignalSlot *slot = (SignalSlot *) me->signals->pdata [i];
-
-
+
+
+
+
-                g_slice_free (SignalSlot, slot);
-        }