Changeset 1746

Timestamp:

03/25/07 13:55:19

Author:

pvanhoof

Message:

Filling up the summary or headers view while downloading information is taking place

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-folder.c (modified) (6 diffs)
• trunk/libtinymail-camel/tny-camel-folder.c (modified) (2 diffs)
• trunk/libtinymailui-gtk/tny-gtk-header-list-model.c (modified) (17 diffs)
• trunk/tests/c-demo/tny-demoui-summary-view.c (modified) (5 diffs)

trunk/ChangeLog

@@ +1 @@
+2007-03-25  Philip Van Hoof  <pvanhoof@gnome.org>
+
+        * Support for filling up the header view (a.k.a. the summary view)
+        with already or recently downloaded information while downloading is
+        taking place. Take a look at the demo user interface's code to learn
+        how to leverage this feature: You basically need to register the list
+        (which will for example be a TnyGtkHeaderListModel instance) with the
+        TnyFolderMonitor before launching the tny_folder_refresh_async method.
+
+        * This ain't an API change, but this new feature does make more
+        possible with the same API. It might also change behaviour a little
+        bit (although it shouldn't for the old-style of using the TnyFolderMonitor,
+        or at least not as far as I know and tested).
+
-2007-03-23  Philip Van Hoof  <pvanhoof@gnome.org>
-

trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-folder.c

@@ -2977 +2977 @@
-        gboolean did_hack = FALSE;
-        gint hcnt = 0;
+        CamelFolderChangeInfo *mchanges;
-
-        imap_folder->need_rescan = TRUE;
@@ -3081 +3082 @@
-                qsort (needheaders->pdata, needheaders->len,
-                        sizeof (void *), uid_compar);
+
+                mchanges = camel_folder_change_info_new ();
-
-                while (uid < needheaders->len) 
@@ -3150 +3153 @@
-                                                for (r = curlen-1; r >= sequence -1; r--)
-                                                { 
-printf ("
+g_warning ("Problem with your local summary store (too much), correcting: 
-                                                        CamelMessageInfo *ri = g_ptr_array_index (folder->summary->messages, r);
-                                                        if (ri) {
-
-
-
-
-
-
-
+
-                                                                ((CamelMessageInfoBase*)ri)->flags |= CAMEL_MESSAGE_EXPUNGED;
-                                                                ((CamelMessageInfoBase*)ri)->flags |= CAMEL_MESSAGE_FREED;
@@ -3169 +3166 @@
-                                                {
-                                                        CamelMessageInfo *ni = camel_message_info_clone (mi);
-
+
+
-                                                                camel_folder_summary_add (folder->summary, (CamelMessageInfo *)ni);
+                                                                /* camel_folder_change_info_add_uid (mchanges, camel_message_info_uid (ni)); */
+                                                        }
-                                                }
-                                        }
@@ -3177 +3177 @@
-
-                                  camel_folder_summary_add (folder->summary, (CamelMessageInfo *)mi);
-
+
+
+
-                                   if ((mi->info.flags & CAMEL_IMAP_MESSAGE_RECENT))
-
+m
-                                }
-
@@ -3211 +3213 @@
-
-                }
+
+                
+                if (camel_folder_change_info_changed (mchanges)) {
+                        camel_object_trigger_event (CAMEL_OBJECT (folder), "folder_changed", mchanges);
+                        /* printf ("Changes!\n"); */
+                }
+                camel_folder_change_info_free (mchanges);
+
-        }
-

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

@@ -134 +134 @@
-        gboolean need_unread_sync;
-
+        /* printf ("want changes: %s, have folder: %s\n", 
+                priv->want_changes?"yes":"no",
+                priv->folder?"yes":"no");
+
-        if (!priv->want_changes)
-
+ */
-
-        g_static_rec_mutex_lock (priv->folder_lock);
@@ -145 +149 @@
-
-        summary = priv->folder->summary;
+
+        /* printf ("%d added\n", info->uid_added?info->uid_added->len:-1); */
-
-        for (i = 0; i< info->uid_added->len; i++)

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

@@ -94 +94 @@
-        g_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
-
-        g_mutex_lock (list_model->folder_lock);
-        g_static_rec_mutex_lock (list_model->iterator_lock);
-
@@ -112 +111 @@
-
-        g_static_rec_mutex_unlock (list_model->iterator_lock);
-        g_mutex_unlock (list_model->folder_lock);
-
-        return retval;
@@ -125 +123 @@
-
-        /* Return the path of an existing GtkTreeIter */
-
-        if  (!(iter->stamp == TNY_GTK_HEADER_LIST_MODEL (self)->stamp))
-                return NULL;
-
-        g_mutex_lock (list_model->folder_lock);
-        g_static_rec_mutex_lock (list_model->iterator_lock);
-
@@ -136 +132 @@
-        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;
-        }
@@ -144 +139 @@
-
-        g_static_rec_mutex_unlock (list_model->iterator_lock);
-        g_mutex_unlock (list_model->folder_lock);
-
-        return tree_path;
@@ -234 +228 @@
-                return;
-
-        g_mutex_lock (list_model->folder_lock);
-        g_static_rec_mutex_lock (list_model->iterator_lock);
-
@@ -317 +310 @@
-
-        g_static_rec_mutex_unlock (list_model->iterator_lock);
-        g_mutex_unlock (list_model->folder_lock);
-
-        return;
@@ -332 +324 @@
-                return FALSE;
-
-        g_mutex_lock (list_model->folder_lock);
-        g_static_rec_mutex_lock (list_model->iterator_lock);
-
@@ -347 +338 @@
-
-        g_static_rec_mutex_unlock (list_model->iterator_lock);
-        g_mutex_unlock (list_model->folder_lock);
-
-        return retval;
@@ -368 +358 @@
-           return the full length. */
-
-        g_mutex_lock (list_model->folder_lock);
-        g_static_rec_mutex_lock (list_model->iterator_lock);
-
@@ -375 +364 @@
-
-        g_static_rec_mutex_unlock (list_model->iterator_lock);
-        g_mutex_unlock (list_model->folder_lock);
-
-        return retval;
@@ -389 +377 @@
-                return FALSE;
-
-        g_mutex_lock (list_model->folder_lock);
-        g_static_rec_mutex_lock (list_model->iterator_lock);
-
@@ -403 +390 @@
-
-        g_static_rec_mutex_unlock (list_model->iterator_lock);
-        g_mutex_unlock (list_model->folder_lock);
-
-        return retval;
@@ -427 +413 @@
-
-
+typedef struct
+{
+        TnyGtkHeaderListModel *self;
+        GtkTreePath *path;
+        GtkTreeIter iter;
+} notify_views_data_t;
+
+static gboolean
+notify_views (gpointer data)
+{
+        notify_views_data_t *stuff = data;
+
+        gtk_tree_model_row_inserted (GTK_TREE_MODEL (stuff->self), stuff->path, &(stuff->iter));
+        gtk_tree_path_free (stuff->path);
+        g_object_unref (G_OBJECT (stuff->self));
+        g_slice_free (notify_views_data_t, data);
+
+        return FALSE;
+}
+
-static void
-tny_gtk_header_list_model_prepend (TnyList *self, GObject* item)
@@ -432 +438 @@
-        TnyGtkHeaderListModel *me = (TnyGtkHeaderListModel*)self;
-        GtkTreePath *path;
-GtkTreeIter iter
+notify_views_data_t *stuff
-
-        g_static_rec_mutex_lock (me->iterator_lock);
-
-
-
-
+
+
+
+
+
-
-        /* Prepend something to the list */
-
-        g_object_ref (G_OBJECT (item));
-        g_ptr_array_add (me->items, item);
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-        g_static_rec_mutex_unlock (me->iterator_lock);
@@ -479 +493 @@
-{
-        TnyGtkHeaderListModel *me = (TnyGtkHeaderListModel*)self;
-
+ = NULL
-        gint i; gboolean found = FALSE;
-
@@ -502 +516 @@
-                iter.user_data = (gpointer) i;
-                path = tny_gtk_header_list_model_get_path (GTK_TREE_MODEL (me), &iter);
+                if (path)
+                {
+                        /* Letting the observers know about this (the GtkTreeView) */
+                        gtk_tree_model_row_deleted (GTK_TREE_MODEL (me), path);
+                        gtk_tree_path_free (path);
+                }
-                g_ptr_array_remove (me->items, item);
-
-
-
-
+
+
+
-
-        g_object_unref (G_OBJECT (item));
-
-        g_static_rec_mutex_unlock (me->iterator_lock);
-}
-

trunk/tests/c-demo/tny-demoui-summary-view.c

@@ -264 +264 @@
-        TnyDevice *device = tny_account_store_get_device (account_store);
-
-
-
-
+
+
-                TnyDevice *odevice = tny_account_store_get_device (priv->account_store);
-
@@ -434 +433 @@
-{
-        TnyDemouiSummaryViewPriv *priv = user_data;
+        GtkTreeModel *select_model;
-
-        if (!cancelled)
-        {
-                GtkTreeView *header_view = GTK_TREE_VIEW (priv->header_view);
-                GtkTreeModel *sortable;
-                GtkTreeModel *select_model;
-                GtkTreeModel *model = tny_gtk_header_list_model_new ();
-                gboolean refresh = FALSE;
-
-#ifndef ASYNC_HEADERS
-                refresh = TRUE;
-#endif
-
-                tny_gtk_header_list_model_set_folder (TNY_GTK_HEADER_LIST_MODEL (model), folder, refresh);
-                sortable = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (model));
-
-                gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (sortable),
-                        TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_COLUMN,
-                        tny_gtk_header_list_model_received_date_sort_func, 
-                        NULL, NULL);
-
-                gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (sortable),
-                        TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_COLUMN,
-                        tny_gtk_header_list_model_sent_date_sort_func, 
-                        NULL, NULL);
-
-                g_mutex_lock (priv->monitor_lock);
-                {
-
-                        if (priv->monitor)
-                        {
-                                tny_folder_monitor_stop (priv->monitor);
-                                g_object_unref (G_OBJECT (priv->monitor));
-                        }
-
-                        priv->monitor = TNY_FOLDER_MONITOR (tny_folder_monitor_new (folder));
-                        tny_folder_monitor_add_list (priv->monitor, TNY_LIST (model));
-                        tny_folder_monitor_start (priv->monitor);
-                }
-                g_mutex_unlock (priv->monitor_lock);
-
-                set_header_view_model (header_view, sortable);
-
-                g_idle_add (cleanup_statusbar, priv);
-
@@ -525 +485 @@
-        GtkTreeIter iter;
-        GtkTreeModel *model;
+        GtkTreeModel *hmodel;
+        GtkTreeView *header_view = GTK_TREE_VIEW (priv->header_view);
+        GtkTreeModel *sortable;
+        gboolean refresh = FALSE;
+
+#ifndef ASYNC_HEADERS
+        refresh = TRUE;
+#endif
+
-
-        if (gtk_tree_selection_get_selected (selection, &model, &iter))
@@ -557 +526 @@
-                        gtk_widget_show (GTK_WIDGET (priv->progress));
-                        gtk_widget_set_sensitive (GTK_WIDGET (priv->header_view), FALSE);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#ifdef ASYNC_HEADERS
-
-                        tny_folder_refresh_async (folder, 
-                                refresh_current_folder, 
@@ -566 +566 @@
-                        refresh_current_folder (folder, FALSE, NULL, user_data);
-#endif
-
+
-                        g_object_unref (G_OBJECT (folder));
-                }