From: Alberto Garcia <agarcia@igalia.com>
Date: Mon, 5 Nov 2007 17:21:15 +0000 (+0000)
Subject: Move messages from the viewer if the source folder is local
X-Git-Tag: git_migration_finished~2161
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=fc4669939cc36749330dbb20b5b7d7fc720cd113

Move messages from the viewer if the source folder is local
Fixes NB#74626

pmo-trunk-r3650
---

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 9cffa20..9252b72 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -4434,17 +4434,27 @@ modest_ui_actions_on_msg_view_window_move_to (GtkAction *action,
 	TnyHeader *header = NULL;
 	TnyFolder *src_folder = NULL;
 	TnyAccount *account = NULL;
+	gboolean do_xfer = FALSE;
 
 	/* Create header list */
 	header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win));		
 	src_folder = TNY_FOLDER (tny_header_get_folder(header));
 	g_object_unref (header);
 
-	/* Transfer the message if online or confirmed by the user */
 	account = tny_folder_get_account (src_folder);
-        if (remote_folder_is_pop(TNY_FOLDER_STORE (src_folder)) ||
-            (modest_platform_is_network_folderstore(TNY_FOLDER_STORE (src_folder)) && 
-	     connect_to_get_msg(MODEST_WINDOW (win), 1, account))) {
+	if (!modest_platform_is_network_folderstore(TNY_FOLDER_STORE(src_folder))) {
+		/* Transfer if the source folder is local */
+		do_xfer = TRUE;
+	} else if (remote_folder_is_pop(TNY_FOLDER_STORE(src_folder))) {
+		/* Transfer if the source folder is POP (as it means
+		 * that the message is already downloaded) */
+		do_xfer = TRUE;
+	} else if (connect_to_get_msg(MODEST_WINDOW(win), 1, account)) {
+		/* Transfer after asking confirmation */
+		do_xfer = TRUE;
+	}
+
+	if (do_xfer) {
 		modest_ui_actions_xfer_messages_from_move_to (dst_folder, MODEST_WINDOW (win));
         }
 	g_object_unref (account);