Changeset 26

Timestamp:

11/01/07 15:01:03

Author:

pvanhoof

Message:

• • • • Implemented moving folders around
        

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/src/Makefile.am (modified) (1 diff)
• trunk/src/tmut-menu-view.c (modified) (9 diffs)

trunk/ChangeLog

@@ -4 +4 @@
-        * Implementation of copy&move and delete of folders
-        * Further refactoring
+        * Implemented moving folders around
-
-2007-10-31  Philip Van Hoof  <pvanhoof@gnome.org>

trunk/src/Makefile.am

@@ -10 +10 @@
-        tmut-folder-view.c \
-        tmut-folder-view.h \
+        tmut-folder-selector.c \
+        tmut-folder-selector.h \
-        tmut-msg-view.c \
-        tmut-msg-view.h \

trunk/src/tmut-menu-view.c

@@ -20 +20 @@
-#include "tmut-menu-view.h"
-#include "tmut-folder-view.h"
+#include "tmut-folder-selector.h"
-#include "tmut-shell-window.h"
-#include "tmut-shell-child.h"
@@ -33 +34 @@
-{
-        GtkTreeView *folders_treeview;
-        GtkButton *newmsg_button;
-        GtkComboBox *accounts_combo;
-        TMutShellWindow *shell;
+        TnyAccountStore *account_store;
-};
-
@@ -59 +60 @@
-        TMutMenuView *self = TMUT_MENU_VIEW (user_data);
-        TMutMenuViewPriv *priv = TMUT_MENU_VIEW_GET_PRIVATE (self);
-err->message
+""
-
-        if (canceled)
-                msg = "User canceled the operation";
+        else if (err)
+                msg = err->message;
+
-        if (err || canceled) 
-        {
@@ -82 +86 @@
-}
-
+typedef struct {
+        TnyFolder *from;
+        TMutMenuView *self;
+        gboolean del_originals;
+} OnMoveSelectedInfo;
+
+static void
+on_folder_selected_for_move (GtkWidget *widget, gpointer user_data)
+{
+        OnMoveSelectedInfo *info = (OnMoveSelectedInfo *) user_data;
+        TMutMenuViewPriv *priv = TMUT_MENU_VIEW_GET_PRIVATE (info->self);
+        TnyFolderStore *into = tmut_folder_selector_get_current (TMUT_FOLDER_SELECTOR (widget));
+
+        if (into) 
+        {
+                if (into != (TnyFolderStore *) info->from)
+                        tny_folder_copy_async (info->from, into, 
+                                tny_folder_get_name (info->from), 
+                                info->del_originals, on_copy_done, 
+                                status_update,
+                                g_object_ref (info->self));
+
+                g_object_unref (into);
+        }
+
+        tmut_shell_window_back (priv->shell);
+
+        return;
+}
+
+static void
+on_folder_selected_for_move_destroy (GtkWidget *widget, gpointer user_data)
+{
+        OnMoveSelectedInfo *info = (OnMoveSelectedInfo *) user_data;
+
+        g_object_unref (info->from);
+        g_object_unref (info->self);
+        g_slice_free (OnMoveSelectedInfo, info);
+
+        return;
+}
+
-void
-tmut_menu_view_on_folder_move_activated (GObject *sender, TMutMenuView *self)
@@ -100 +146 @@
-                {
-                        TnyFolder *folder;
-
+
+
-
-                        gtk_tree_model_get (model, &iter, 
@@ -109 +156 @@
-                                gboolean del_originals = TRUE;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                                g_object_unref (folder);
@@ -369 +428 @@
-        gtk_combo_box_set_active (priv->accounts_combo, 0);
-
+        if (priv->account_store)
+                g_object_unref (priv->account_store);
+        priv->account_store = TNY_ACCOUNT_STORE (g_object_ref (account_store));
+
-        return;
-}
@@ -421 +484 @@
-        GtkTreeViewColumn *column;
-        GtkTreeSelection *select;
-
-
+
+
+
-        priv->accounts_combo = GTK_COMBO_BOX (gtk_combo_box_new ());
-        gtk_widget_show (GTK_WIDGET (priv->accounts_combo));
@@ -469 +533 @@
-        TMutMenuViewPriv *priv = TMUT_MENU_VIEW_GET_PRIVATE (object);
-
+        if (priv->account_store)
+                g_object_unref (priv->account_store);
+
-        (*parent_class->finalize) (object);
-