Changeset 2848

Timestamp:

10/18/07 15:36:05

Author:

pvanhoof

Message:

• • • • Implemented a small test that makes it possible to transfer messages
        

from one folder to another using the demoui

• • • • Removed a few invalid assertion
        

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail/tny-folder-store.c (modified) (1 diff)
• trunk/libtinymail/tny-folder.c (modified) (3 diffs)
• trunk/libtinymailui-gtk/tny-gtk-folder-store-tree-model.c (modified) (1 diff)
• trunk/tests/c-demo/tny-demoui-summary-view.c (modified) (1 diff)

trunk/ChangeLog

@@ -6 +6 @@
-        * Added a -DMERGEFOLDERTEST that will perform a test for
-        TnyMergeFolder
+        * Implemented a small test that makes it possible to transfer messages
+        from one folder to another using the demoui
+        * Removed a few invalid assertions
-
-2007-10-17  Philip Van Hoof  <pvanhoof@gnome.org>

trunk/libtinymail/tny-folder-store.c

@@ -308 +308 @@
-        g_assert (TNY_IS_FOLDER_STORE (self));
-        g_assert (list);
-        g_assert (callback);
-        g_assert (TNY_IS_LIST (list));
-        if (query)

trunk/libtinymail/tny-folder.c

@@ -808 +808 @@
-#ifdef DBC /* require */
-        g_assert (TNY_IS_FOLDER (self));
-        g_assert (callback);
-        g_assert (status_callback);
-        g_assert (TNY_FOLDER_GET_IFACE (self)->refresh_async_func != NULL);
-#endif
@@ -1032 +1030 @@
-        g_assert (folder_dst);
-        g_assert (TNY_IS_FOLDER (folder_dst));
-        g_assert (callback);
-        g_assert (TNY_FOLDER_GET_IFACE (self)->transfer_msgs_async_func != NULL);
-#endif
@@ -1190 +1187 @@
-        g_assert (header);
-        g_assert (TNY_IS_HEADER (header));
-        g_assert (callback);
-        g_assert (status_callback);
-        g_assert (TNY_FOLDER_GET_IFACE (self)->get_msg_async_func != NULL);
-#endif

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

@@ -307 +307 @@
-                        break;
-                }
-G_OBJECT (citem)
+citem
-
-          } while (gtk_tree_model_iter_next (model, &iter));

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

@@ -1521 +1521 @@
-}
-
+
+typedef struct {
+        TnyHeader *header;
+        TnyFolder *to_folder;
+} OnMoveToFolderInfo;
+
+static void 
+on_move_to_folder_activate (GtkMenuItem *mitem, gpointer user_data)
+{
+        OnMoveToFolderInfo *info = user_data;
+        TnyFolder *folder = tny_header_get_folder (info->header);
+
+        if (folder) 
+        {
+                TnyList *headers = tny_simple_list_new ();
+
+                g_print ("Transfering: %s to %s\n",
+                        tny_header_get_subject (info->header), 
+                        tny_folder_get_name (info->to_folder));
+
+                tny_list_prepend (headers, (GObject *) info->header);
+                tny_folder_transfer_msgs_async (folder, headers, info->to_folder, 
+                        FALSE, NULL, NULL, user_data);
+                g_object_unref (headers);
+        }
+
+        return;
+}
+
+static void
+recursive_all_folders (GtkWidget *my_widget, GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data, GtkWidget *menu)
+{
+        TnyDemouiSummaryView *self = user_data;
+        TnyDemouiSummaryViewPriv *priv = TNY_DEMOUI_SUMMARY_VIEW_GET_PRIVATE (self);
+
+        do {
+                GtkTreeIter niter;
+                GObject *citem;
+                gchar *line;
+
+                gtk_tree_model_get (model, iter, 
+                        TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, 
+                        &citem, TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &line, -1);
+
+                if (TNY_IS_FOLDER (citem))
+                {
+                        GtkTreeIter hiter;
+                        GtkTreeModel *hmodel = gtk_tree_view_get_model (priv->header_view);
+                        GtkTreeSelection *sel = gtk_tree_view_get_selection (priv->header_view);
+
+                        if (gtk_tree_selection_get_selected (sel, &hmodel, &hiter))
+                        {
+                                /* Small leak, indeed */
+                                OnMoveToFolderInfo *info = g_new0 (OnMoveToFolderInfo, 1);
+                                GtkWidget *menuitem = NULL;
+
+                                info->to_folder = (TnyFolder *) citem;
+                                gtk_tree_model_get (hmodel, &hiter, 
+                                        TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, 
+                                        &info->header, -1);
+
+                                menuitem = gtk_menu_item_new_with_label (tny_folder_get_name ((TnyFolder *)citem));
+
+                                g_signal_connect (G_OBJECT (menuitem), "activate",
+                                        G_CALLBACK (on_move_to_folder_activate), info);
+
+                                gtk_widget_show (menuitem);
+                                gtk_menu_prepend (menu, menuitem);
+                        }
+                }
+
+                g_object_unref (citem);
+
+                if (gtk_tree_model_iter_children (model, &niter, iter)) {
+                        recursive_all_folders (my_widget, model, &niter, user_data, menu);
+                }
+
+        } while (gtk_tree_model_iter_next (model, iter));
+}
+
-static void
-header_view_do_popup_menu (GtkWidget *my_widget, GdkEventButton *event, gpointer user_data)
-{
+        TnyDemouiSummaryView *self = user_data;
+        TnyDemouiSummaryViewPriv *priv = TNY_DEMOUI_SUMMARY_VIEW_GET_PRIVATE (self);
+
-        GtkWidget *menu;
-        int button, event_time;
+        GtkTreeView *view = priv->mailbox_view;
+        GtkTreeModel *model = gtk_tree_view_get_model (view);
-
-        menu = gtk_menu_new ();
-
-
-
+
+
+
+
+
+
-
-        if (event)