Changeset 1788

Timestamp:

04/13/07 17:56:13

Author:

pvanhoof

Message:

Bugfixes and tests for the mergefolder

Files:

• trunk/libtinymail/tny-merge-folder.c (modified) (2 diffs)
• trunk/libtinymailui-gtk/tny-gtk-folder-store-tree-model.c (modified) (2 diffs)
• trunk/tests/c-demo/tny-demoui-summary-view.c (modified) (4 diffs)

trunk/libtinymail/tny-merge-folder.c

@@ -486 +486 @@
-
-        return;
+}
+
+TnyFolder*
+tny_merge_folder_new (void)
+{
+        TnyMergeFolder *self = g_object_new (TNY_TYPE_MERGE_FOLDER, NULL);
+
+        return TNY_FOLDER (self);
+
-}
-
@@ -569 +578 @@
-        object_class = (GObjectClass*) klass;
-        object_class->finalize = tny_merge_folder_finalize;
+
+        g_type_class_add_private (object_class, sizeof (TnyMergeFolderPriv));
+
-}
-

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

@@ -671 +671 @@
-}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        TnyFolderChangeChanged changed = tny_folder_change_get_changed (change);
-        GtkTreeModel *model = GTK_TREE_MODEL (self);
-        TnyGtkFolderStoreTreeModel *me = (TnyGtkFolderStoreTreeModel *) self;
-
+
-        if (changed & TNY_FOLDER_CHANGE_CHANGED_FOLDER_RENAME ||
-                changed & TNY_FOLDER_CHANGE_CHANGED_ALL_COUNT || 
-                changed & TNY_FOLDER_CHANGE_CHANGED_UNREAD_COUNT)
-        {
+                gdk_threads_enter ();
-                gtk_tree_model_foreach (model, updater, change);
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        TnyFolderStoreChangeChanged changed = tny_folder_store_change_get_changed (change);
-        GtkTreeModel *model = GTK_TREE_MODEL (self);
@@ -764 +801 @@
-                g_object_unref (G_OBJECT (removed));
-        }
+
+
+        g_object_unref (self);
+        g_object_unref (change);
+
+        g_slice_free (FolStObsUpInfo, info);
+
+        return FALSE;
+}
+
+static void
+tny_gtk_folder_store_tree_model_store_obsr_update (TnyFolderStoreObserver *self, TnyFolderStoreChange *change)
+{
+        FolStObsUpInfo *info = g_slice_new (FolStObsUpInfo);
+        info->self = TNY_FOLDER_OBSERVER (g_object_ref (self));
+        info->change = TNY_FOLDER_STORE_CHANGE (g_object_ref (change));
+
+        g_timeout_add (0, folder_store_obsr_update_idle, info);
+
+        return;
-}
-

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

@@ -65 +65 @@
-#include <tny-summary-view.h>
-#include <tny-account-store-view.h>
+#include <tny-merge-folder.h>
-
-#define GO_ONLINE_TXT _("Go online")
@@ -922 +923 @@
-}
-
+
+static void 
+on_merge_view_activate (GtkMenuItem *mitem, gpointer user_data)
+{
+        TnyDemouiSummaryView *self = user_data;
+        TnyDemouiSummaryViewPriv *priv = TNY_DEMOUI_SUMMARY_VIEW_GET_PRIVATE (self);
+        GtkTreeModel *model, *hmodel;
+        GtkTreeModel *sortable;
+        GList *list;
+        TnyFolder *merge = tny_merge_folder_new ();
+        GtkTreeView *header_view = GTK_TREE_VIEW (priv->header_view);
+
+        list = gtk_tree_selection_get_selected_rows (priv->mailbox_select, &model);
+
+        while (list)
+        {
+                GtkTreePath *path = list->data;
+                GtkTreeIter iter;
+                TnyFolder *folder;
+
+                gtk_tree_model_get_iter (model, &iter, path);
+                gtk_tree_model_get (model, &iter, 
+                        TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, 
+                        &folder, -1);
+
+                if (folder && TNY_IS_FOLDER (folder))
+                {
+                        tny_merge_folder_add_folder (TNY_MERGE_FOLDER (merge), folder);
+                        g_object_unref (folder);
+                }
+
+                gtk_tree_path_free (path);
+                list = g_list_next (list);
+        }
+
+        hmodel = tny_gtk_header_list_model_new ();
+        tny_gtk_header_list_model_set_folder (TNY_GTK_HEADER_LIST_MODEL (hmodel), 
+                merge, FALSE);
+
+
+        sortable = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (hmodel));
+
+        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);
+
+        set_header_view_model (header_view, sortable);
+
+        g_list_free (list);
+}
+
-static void
-header_view_do_popup_menu (GtkWidget *my_widget, GdkEventButton *event, gpointer user_data)
@@ -974 +1032 @@
-{
-        GtkWidget *menu;
-
+, *mmerge
-        int button, event_time;
-
-        menu = gtk_menu_new ();
-        //g_signal_connect (menu, "deactivate", G_CALLBACK (gtk_widget_destroy), NULL);
-
-        mrename = gtk_menu_item_new_with_label (_("Rename folder"));
-        mcreate = gtk_menu_item_new_with_label (_("Create folder"));
-        mdelete = gtk_menu_item_new_with_label (_("Delete folder"));
+        mmerge = gtk_menu_item_new_with_label (_("Merge view of selected"));
-
-        g_signal_connect (G_OBJECT (mrename), "activate",
@@ -990 +1048 @@
-        g_signal_connect (G_OBJECT (mdelete), "activate",
-                G_CALLBACK (on_delete_folder_activate), user_data);
+        g_signal_connect (G_OBJECT (mmerge), "activate",
+                G_CALLBACK (on_merge_view_activate), user_data);
-
-        gtk_menu_prepend (menu, mrename);
-        gtk_menu_prepend (menu, mcreate);
-        gtk_menu_prepend (menu, mdelete);
+        gtk_menu_prepend (menu, mmerge);
-
-        gtk_widget_show (mrename);
-        gtk_widget_show (mcreate);
-        gtk_widget_show (mdelete);
-
+
-
-        if (event)