Changeset 52

Timestamp:

11/08/07 19:10:13

Author:

pvanhoof

Message:

• • • • Implemented copying a message (not just moving)
        

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/src/tmut-folder-selector.c (modified) (1 diff)
• trunk/src/tmut-folder-view.c (modified) (7 diffs)
• trunk/src/tmut-folder-view.h (modified) (1 diff)
• trunk/src/tmut-menu-view.c (modified) (4 diffs)

trunk/ChangeLog

@@ -2 +2 @@
-
-        * Detecting the Tinymail platform library
+        * Implemented copying a message (not just moving)
-
-2007-11-06  Philip Van Hoof  <pvanhoof@gnome.org>

trunk/src/tmut-folder-selector.c

@@ -167 +167 @@
-}
-
+
-static void
-tmut_folder_selector_finalize (GObject *object)
-{
-        TMutFolderSelectorPriv *priv = TMUT_FOLDER_SELECTOR_GET_PRIVATE (object);
-
-        (*parent_class->finalize) (object);

trunk/src/tmut-folder-view.c

@@ -144 +144 @@
-}
-
-
-
+
+
+
-{
-        TMutFolderViewPriv *priv = TMUT_FOLDER_VIEW_GET_PRIVATE (self);
@@ -173 +174 @@
-                        tny_list_prepend (info->items, G_OBJECT (header));
-
-
-
+
-
-                        view = tmut_folder_selector_new ();
@@ -198 +198 @@
-}
-
+void
+tmut_folder_view_on_message_move_activated (GObject *sender, TMutFolderView *self)
+{
+        message_movecopy_helper (self, TRUE);
+        return;
+}
+
+
+
+void
+tmut_folder_view_on_message_copy_activated (GObject *sender, TMutFolderView *self)
+{
+        message_movecopy_helper (self, FALSE);
+        return;
+}
-
-
@@ -254 +269 @@
-{
-        GtkMenu *menu;
-
+, *mcopy_menuitem
-        GtkButton *menu_button;
-
@@ -263 +278 @@
-        mdel_menuitem = gtk_menu_item_new_with_label (_("Delete a message"));
-        mmove_menuitem = gtk_menu_item_new_with_label (_("Move a message"));
+        mcopy_menuitem = gtk_menu_item_new_with_label (_("Copy a message"));
-
-        gtk_widget_show (mdel_menuitem);
-        gtk_widget_show (mmove_menuitem);
+        gtk_widget_show (mcopy_menuitem);
-        gtk_widget_show (GTK_WIDGET (menu));
-
@@ -272 +289 @@
-        gtk_menu_prepend (menu, mdel_menuitem);
-        gtk_menu_prepend (menu, mmove_menuitem);
+        gtk_menu_prepend (menu, mcopy_menuitem);
-
-        gtk_menu_attach_to_widget (menu, GTK_WIDGET (menu_button), NULL);
@@ -282 +300 @@
-        g_signal_connect (G_OBJECT (mmove_menuitem), "activate",
-                G_CALLBACK (tmut_folder_view_on_message_move_activated), self);
+        g_signal_connect (G_OBJECT (mcopy_menuitem), "activate",
+                G_CALLBACK (tmut_folder_view_on_message_copy_activated), self);
-
-        gtk_box_pack_start (GTK_BOX (self), GTK_WIDGET (menu_button), FALSE, TRUE, 0);

trunk/src/tmut-folder-view.h

@@ -65 +65 @@
-void tmut_folder_view_on_message_delete_activated (GObject *sender, TMutFolderView *self);
-void tmut_folder_view_on_message_move_activated (GObject *sender, TMutFolderView *self);
+void tmut_folder_view_on_message_copy_activated (GObject *sender, TMutFolderView *self);
-
-G_END_DECLS

trunk/src/tmut-menu-view.c

@@ -493 +493 @@
-}
-
-static void 
-stop_folders_treeview (TMutMenuView *self)
-{
-        TMutMenuViewPriv *priv = TMUT_MENU_VIEW_GET_PRIVATE (self);
-        GtkTreeModel *old_model = gtk_tree_view_get_model (priv->folders_treeview);
-        if (old_model)
-                tny_gtk_folder_store_tree_model_stop_observing (TNY_GTK_FOLDER_STORE_TREE_MODEL (old_model));
-        return;
-}
-
-void 
@@ -516 +507 @@
-        tny_gtk_folder_store_tree_model_append (TNY_GTK_FOLDER_STORE_TREE_MODEL (model),
-                TNY_FOLDER_STORE (account), tny_account_get_name (account));
-
-        stop_folders_treeview (self);
-
-        gtk_tree_view_set_model (priv->folders_treeview, model);
@@ -635 +624 @@
-        gtk_widget_show (sw);
-        priv->folders_treeview = GTK_TREE_VIEW (gtk_tree_view_new ());
-        g_object_ref (priv->folders_treeview);
-        gtk_tree_view_set_headers_visible (priv->folders_treeview, FALSE);
-        gtk_tree_view_set_rules_hint (priv->folders_treeview, TRUE);
@@ -666 +654 @@
-        TMutMenuViewPriv *priv = TMUT_MENU_VIEW_GET_PRIVATE (object);
-
-        if (priv->folders_treeview) {
-                stop_folders_treeview ((TMutMenuView *) object);
-                g_object_unref (priv->folders_treeview);
-        }
-
-        if (priv->account_store)
-                g_object_unref (priv->account_store);