From: Sergio Villar Senín <svillar@igalia.com>
Date: Fri, 18 Dec 2009 18:32:42 +0000 (+0100)
Subject: Destination folders not shown in "Move to" dialog for local msgs
X-Git-Tag: 3.2.7~1
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=554b43b43c2c4b02ed0ff74070a94f59170bd3c8

Destination folders not shown in "Move to" dialog for local msgs

We need to take the active account from the folders window

Fixes NB#151343
---

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index de64ab1..caa0c3e 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -1487,6 +1487,11 @@ open_msg_performer(gboolean canceled,
 	gboolean can_open;
 	gchar *account_name = get_info_from_header (helper->header, &is_draft, &can_open);
 
+	if (!g_strcmp0 (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) {
+		g_free (account_name);
+		account_name = g_strdup (modest_window_get_active_account (MODEST_WINDOW (parent_window)));
+	}
+
 	if (!can_open) {
 		modest_window_mgr_unregister_header (modest_runtime_get_window_mgr (), helper->header);
 		g_free (account_name);
@@ -5395,8 +5400,6 @@ create_move_to_dialog (GtkWindow *win,
 
 		modest_folder_view_set_style (MODEST_FOLDER_VIEW (tree_view),
 					      MODEST_FOLDER_VIEW_STYLE_SHOW_ALL);
-		/* modest_folder_view_update_model (MODEST_FOLDER_VIEW (tree_view), */
-		/* 				 TNY_ACCOUNT_STORE (modest_runtime_get_account_store ())); */
 
 		active_account_name = modest_window_get_active_account (MODEST_WINDOW (win));
 		mgr = modest_runtime_get_account_mgr ();