Changeset 1913

Timestamp:

05/08/07 13:22:08

Author:

pvanhoof

Message:

Removing items bug

Files:

• trunk/libtinymail-camel/tny-camel-folder.c (modified) (6 diffs)
• trunk/libtinymailui-gtk/tny-gtk-header-list-model.c (modified) (6 diffs)

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

@@ -80 +80 @@
-        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
-        TnyIterator *iter;
+        TnyList *list;
-
-        if (!priv->sobservers)
@@ -85 +86 @@
-
-        g_static_rec_mutex_lock (priv->obs_lock);
-
-
+
+
+
+
+
-        while (!tny_iterator_is_done (iter))
-        {
@@ -96 +100 @@
-        g_object_unref (G_OBJECT (iter));
-
-static_rec_mutex_unlock (priv->obs_lock
+object_unref (list
-
-}
@@ -105 +109 @@
-        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
-        TnyIterator *iter;
+        TnyList *list;
-
-        if (!priv->observers)
@@ -110 +115 @@
-
-        g_static_rec_mutex_lock (priv->obs_lock);
-
-
+
+
+
+
+
-        while (!tny_iterator_is_done (iter))
-        {
@@ -121 +129 @@
-        g_object_unref (G_OBJECT (iter));
-
-static_rec_mutex_unlock (priv->obs_lock
+object_unref (list
-
-}

trunk/libtinymailui-gtk/tny-gtk-header-list-model.c

@@ -94 +94 @@
-        g_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
-
-
+ 
-
-        i = gtk_tree_path_get_indices (path)[0];
@@ -239 +239 @@
-        gint i;
-
-TNY_GTK_HEADER_LIST_MODEL (self)
+list_model
-                return;
-
@@ -572 +572 @@
-        TnyGtkHeaderListModel *self;
-        GObject *item;
+        GMainLoop *loop;
-} notify_views_data_t;
-
@@ -579 +580 @@
-{
-        notify_views_data_t *stuff = data;
+
-        g_object_unref (stuff->item);
-        g_object_unref (stuff->self);
+
+        g_main_loop_unref (stuff->loop);
+
-        g_slice_free (notify_views_data_t, data);
-        return;
@@ -590 +595 @@
-{
-        notify_views_data_t *stuff = data;
-        GObject *item = stuff->item;
-        TnyGtkHeaderListModel *me = (TnyGtkHeaderListModel*) stuff->self;
-        GtkTreePath *path;
-        GtkTreeIter iter;
-
-
+
+
+
+
-
-        for (i=0; i < me->items->len; i++)
@@ -610 +616 @@
-                path = gtk_tree_path_new ();
-                gtk_tree_path_append_index (path, i);
-if (G_LIKELY (path))
-{
-       gtk_tree_model_row_deleted (GTK_TREE_MODEL (me), path)
-       g_mutex_lock (me->ra_lock)
-       me->cur_len--
-       me->registered--
-
-       gtk_tree_path_free (path
-}
-
-       g_static_rec_mutex_lock (me->iterator_lock);
-
-       
-
-               g_object_unref (item);
-}
+gtk_tree_model_row_deleted (GTK_TREE_MODEL (me), path);
+g_mutex_lock (me->ra_lock);
+me->cur_len--
+me->registered--
+g_mutex_unlock (me->ra_lock)
+gtk_tree_path_free (path)
+
+mitem = g_ptr_array_remove_index (me->items, i
+if (mitem)
+
+}
+
+
+
+if (g_main_loop_is_running (stuff->loop))
+       g_main_loop_quit (stuff->loop);
-
-        return FALSE;
-}
-
+
-static void
-tny_gtk_header_list_model_remove (TnyList *self, GObject* item)
-{
+        TnyGtkHeaderListModel *me = (TnyGtkHeaderListModel*) self;
-        notify_views_data_t *stuff;
+
-        stuff = g_slice_new (notify_views_data_t);
-G_OBJECT (self)
+self
-        stuff->item = g_object_ref (item);
-
+
+
+
+
-                notify_views_delete, stuff, notify_views_delete_destroy);
+
+        /* This truly sucks :-( */
+        g_main_loop_run (stuff->loop);
+
-        return;
-}