Changeset 1710

Timestamp:

03/06/07 22:59:06

Author:

pvanhoof

Message:

Some bugfixes

Files:

• trunk/libtinymailui-gtk/tny-gtk-header-list-model.c (modified) (12 diffs)

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

@@ -132 +132 @@
-        g_static_rec_mutex_lock (list_model->iterator_lock);
-
+        i = (gint)iter->user_data;
+
+        if (i < 0 || i >= list_model->items->len) {
+                g_static_rec_mutex_unlock (list_model->iterator_lock);
+                g_mutex_unlock (list_model->folder_lock);
+                return NULL;
+        }
+
-        tree_path = gtk_tree_path_new ();
-        gtk_tree_path_append_index (tree_path, (gint) iter->user_data);
@@ -222 +230 @@
-        const gchar *str;
-        gchar *rdate = NULL;
+        int i;
-
-        if (iter->stamp != TNY_GTK_HEADER_LIST_MODEL (self)->stamp)
@@ -229 +238 @@
-        g_static_rec_mutex_lock (list_model->iterator_lock);
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-        if (((GObject*)header)->ref_count <= 0)
@@ -329 +348 @@
-        newv = ((gint)iter->user_data);
-        newv++;
-
-        iter->user_data = (gpointer) newv;
-
-
+
+
+
+
+
+
-
-        g_static_rec_mutex_unlock (list_model->iterator_lock);
@@ -385 +408 @@
-                iter->user_data = (gpointer) n;
-                retval = TRUE;
+        } else {
+                iter->stamp = -1;
+                iter->user_data = (gpointer) 0;
-        }
-
@@ -424 +450 @@
-        gtk_tree_path_append_index (path, 0);
-        iter.stamp = me->stamp;
-        iter.user_data = (gpointer) me->items->len;
-
-        /* Prepend something to the list */
@@ -430 +455 @@
-        g_object_ref (G_OBJECT (item));
-        g_ptr_array_add (me->items, item);
+        iter.user_data = (gpointer) (me->items->len - 1);
-
-        /* Letting the observers know about this (the GtkTreeView) */
@@ -465 +491 @@
-        TnyGtkHeaderListModel *me = (TnyGtkHeaderListModel*)self;
-        GtkTreePath *path;
-        GtkTreeIter iter;
-        gint i; gboolean found = FALSE;
-
@@ -480 +505 @@
-                }
-
-        iter.stamp = me->stamp;
-        iter.user_data = (gpointer) i;
-
-        /* Remove something from the list */
-
-        if (found)
-        {
+                GtkTreeIter iter;
+                iter.stamp = me->stamp;
+                iter.user_data = (gpointer) i;
-                path = tny_gtk_header_list_model_get_path (GTK_TREE_MODEL (me), &iter);
-                g_ptr_array_remove (me->items, item);
@@ -643 +668 @@
-        GtkTreePath *path;
-
-        iter.stamp = self->stamp;
-        iter.user_data = (gpointer) 0;
-        path = tny_gtk_header_list_model_get_path (GTK_TREE_MODEL (self), &iter);
-
-        g_mutex_lock (self->folder_lock);
-        g_static_rec_mutex_lock (self->iterator_lock);
@@ -664 +685 @@
-        tny_folder_get_headers (folder, TNY_LIST (self), refresh, NULL);
-
+        iter.stamp = self->stamp;
+        iter.user_data = (gpointer) 0;
+        path = tny_gtk_header_list_model_get_path (GTK_TREE_MODEL (self), &iter);
+
-        g_mutex_lock (self->folder_lock);
-        g_static_rec_mutex_lock (self->iterator_lock);
@@ -670 +695 @@
-
-        /* Notify the observers (the GtkTreeView) */
-
-
-
+
+
+
+
+
-
-        g_static_rec_mutex_unlock (self->iterator_lock);