Changeset 1905

Timestamp:

05/08/07 00:19:36

Author:

pvanhoof

Message:

The real fix

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymailui-gtk/tny-gtk-header-list-model.c (modified) (19 diffs)
• trunk/libtinymailui-gtk/tny-gtk-header-list-model.h (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2007-05-08  Philip Van Hoof  <pvanhoof@gnome.org>
+
+        * Real fix for a gtk_tree_model_row_inserted oddity
+        * The problem was that me->cur_len was set to 1 to avoid an assertion
+        in gtktreemodelsort.c (in gtk_tree_model_sort_build_level). The real
+        fix was to check for list_model->cur_len in various GtkTreeModel
+        implementations, rather than the list_model->items->len (only
+        registered items are valid for GtkTreeModel, while registering is
+        slower than simple appends or prepend, as registered requires the
+        registration event to happen in the mainloop)
+
-2007-05-07  Philip Van Hoof  <pvanhoof@gnome.org>
-

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

@@ -90 +90 @@
-{
-        TnyGtkHeaderListModel *list_model = TNY_GTK_HEADER_LIST_MODEL (self);
-
+, tlen
-
-        g_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
@@ -98 +98 @@
-        i = gtk_tree_path_get_indices (path)[0];
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
@@ -118 +121 @@
-{
-        GtkTreePath *tree_path;
-
+, tlen
-        TnyGtkHeaderListModel *list_model = TNY_GTK_HEADER_LIST_MODEL (self);
-
@@ -129 +132 @@
-        i = (gint) iter->user_data;
-
-
+
+
+
+
+
-                g_static_rec_mutex_unlock (list_model->iterator_lock);
-                return NULL;
@@ -135 +142 @@
-
-        tree_path = gtk_tree_path_new ();
-(gint) iter->user_data
+i
-
-        g_static_rec_mutex_unlock (list_model->iterator_lock);
@@ -230 +237 @@
-        const gchar *str;
-        gchar *rdate = NULL;
-
+g
-
-        if (iter->stamp != TNY_GTK_HEADER_LIST_MODEL (self)->stamp)
@@ -243 +250 @@
-        i = (gint) iter->user_data;
-
+        /* Exception on list_model->cur_len (this one truly allows the full 
+         * length of the available data in the array, not only the registered
+         * length, although in 99.999999% of the cases it's the same) */
-        if (i < 0 || i >= list_model->items->len)
-        {
@@ -345 +355 @@
-        iter->user_data = (gpointer) newv;
-
-
+
+
+
-
-        if (!retval) {
@@ -379 +391 @@
-
-        if (G_LIKELY (!iter))
- /* list_model->items->len; */
+
-
-        g_static_rec_mutex_unlock (list_model->iterator_lock);
@@ -391 +403 @@
-        TnyGtkHeaderListModel *list_model = TNY_GTK_HEADER_LIST_MODEL (self);
-        gboolean retval = FALSE;
+        gint tlen;
-
-        if (G_UNLIKELY (parent))
@@ -397 +410 @@
-        g_static_rec_mutex_lock (list_model->iterator_lock);
-
-
+
+
+
+
+
-        {
-                iter->stamp = TNY_GTK_HEADER_LIST_MODEL (self)->stamp;
@@ -431 +448 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        GtkTreePath *path;
-        GtkTreeIter iter;
-} notify_views_data_t;
-
-
-static void
-notify_views_add_destroy (gpointer data)
-{
-        TnyGtkHeaderListModel *me = (TnyGtkHeaderListModel*) data;
-
-        g_mutex_lock (me->ra_lock);
-        me->updating_views = -1;
-        g_mutex_unlock (me->ra_lock);
-
-        g_object_unref (me);
-
-        me->add_timeout = 0;
-
-        return;
-}
-
-static gboolean
-notify_views_add (gpointer data)
-{
-        TnyGtkHeaderListModel *me = (TnyGtkHeaderListModel*) data;
-        gint updated, going_to_update, i, added; 
-        gboolean needmore = FALSE;
-
-        g_mutex_lock (me->ra_lock);
-        me->updating_views++;
-cent_updat
+gister
-                g_mutex_unlock (me->ra_lock);
-                return FALSE;
-        }
-
-
-
+
+
+
+
+
+
-                needmore = TRUE;
- 
-o_update = me->items->len - 1
-
-g_mutex_unlock (me->ra_lock)
+
+b_registered = me->items->len
+
+me->registered = going_tb_registered
-
-        if (me->updating_views < 2)
-                needmore = TRUE;
-
+        g_mutex_unlock (me->ra_lock);
+
-        gdk_threads_enter();
-
-
-
+
+
-        {
-GtkTreeIter iter
-GtkTreePath *path
+iter.stamp = me->stamp
+iter.user_data = (gpointer) i
-                path = gtk_tree_path_new ();
-                gtk_tree_path_append_index (path, i);
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-        }
-        gdk_threads_leave();
@@ -502 +515 @@
-        return needmore;
-}
+
+
-
-/* This will be called often while you are in tny_folder_refresh(_async). It can
@@ -510 +525 @@
-{
-        TnyGtkHeaderListModel *me = (TnyGtkHeaderListModel*)self;
-        gint depth = g_main_depth ();
-        g_static_rec_mutex_lock (me->iterator_lock);
-
@@ -555 +569 @@
-
-
+typedef struct
+{
+        TnyGtkHeaderListModel *self;
+        GObject *item;
+} notify_views_data_t;
+
+
+static void 
+notify_views_delete_destroy (gpointer data)
+{
+        notify_views_data_t *stuff = data;
+        g_object_unref (stuff->item);
+        g_object_unref (stuff->self);
+        g_slice_free (notify_views_data_t, data);
+        return;
+}
+
-
-static gboolean
@@ -560 +591 @@
-{
-        notify_views_data_t *stuff = data;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-        for (i=0; i < me->items->len; i++)
@@ -595 +605 @@
-                }
-
-        /* Remove something from the list */
-
-        if (found)
-        {
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -759 +785 @@
-        self->updating_views = -1;
-        self->ra_lock = g_mutex_new ();
-cent_updat
+gister
-
-        return;
@@ -787 +813 @@
-        }
-
-        self->recent_updated = 0;
-
-        /* Set it to 1 as initial value, else you cause the length > 0 
-         * assertion in gtk_tree_model_sort_build_level (I have no idea why the
-         * assertion is placed there, in stead of a normal return, though) */
- 
-        self->cur_len = 1; 
-
-        g_ptr_array_foreach (self->items, (GFunc)g_object_unref, NULL);
-        if (self->folder)

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

@@ -66 +66 @@
-        GStaticRecMutex *iterator_lock;
-        TnyFolder *folder;
-cent_updat
+gister
-        gint updating_views;
-        GMutex *ra_lock;