X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-platform.c;h=516a72a3d325cd5dbce78c600539bb0018add7f4;hb=111d62dd3cff8802c3ab98c40b046d3206184885;hp=17bec8d6f9b29afdf266ff57143e4cb003010003;hpb=e6209ba00bf9c2ee89446626c131a4bb9f8cce2a;p=modest

diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c
index 17bec8d..516a72a 100644
--- a/src/hildon2/modest-platform.c
+++ b/src/hildon2/modest-platform.c
@@ -947,6 +947,7 @@ static GtkWidget *
 folder_picker_new (TnyFolderStore *suggested, FolderPickerHelper *helper)
 {
 	GtkWidget *button;
+	const gchar *acc_id = NULL;
 
 	button = hildon_button_new (MODEST_EDITABLE_SIZE,
 				    HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
@@ -954,12 +955,13 @@ folder_picker_new (TnyFolderStore *suggested, FolderPickerHelper *helper)
 	hildon_button_set_alignment (HILDON_BUTTON (button), 0.0, 0.5, 1.0, 1.0);
 
 	if (suggested) {
-		const gchar *acc_id = NULL;
 
 		folder_picker_set_store (GTK_BUTTON (button), suggested);
 
 		if (TNY_IS_ACCOUNT (suggested)) {
-			acc_id = tny_account_get_id ((TnyAccount *) suggested);
+			if (!modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (suggested)) &&
+			    !modest_tny_account_is_memory_card_account (TNY_ACCOUNT (suggested)))
+				acc_id = tny_account_get_id ((TnyAccount *) suggested);
 		} else {
 			TnyAccount *account = modest_tny_folder_get_account ((TnyFolder *) suggested);
 			if (account) {
@@ -967,13 +969,14 @@ folder_picker_new (TnyFolderStore *suggested, FolderPickerHelper *helper)
 				g_object_unref (account);
 			}
 		}
+	}
 
-		if (!acc_id)
-			modest_folder_view_get_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(helper->folder_view));
+	if (!acc_id)
+		acc_id = modest_folder_view_get_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(helper->folder_view));
+
+	g_object_set_data_full (G_OBJECT (button), FOLDER_PICKER_ORIGINAL_ACCOUNT,
+				g_strdup (acc_id), (GDestroyNotify) g_free);
 
-		g_object_set_data_full (G_OBJECT (button), FOLDER_PICKER_ORIGINAL_ACCOUNT,
-					g_strdup (acc_id), (GDestroyNotify) g_free);
-	}
 
 	g_signal_connect (G_OBJECT (button), "clicked",
 			  G_CALLBACK (folder_picker_clicked),
@@ -1799,11 +1802,6 @@ modest_platform_create_folder_view_full (TnyFolderStoreQuery *query, gboolean do
 	modest_folder_view_set_style (MODEST_FOLDER_VIEW (widget),
 				      MODEST_FOLDER_VIEW_STYLE_SHOW_ONE);
 
-	/* Restore settings */
-	modest_widget_memory_restore (modest_runtime_get_conf(), 
-				      G_OBJECT (widget),
-				      MODEST_CONF_FOLDER_VIEW_KEY);
-
 	return widget;
 }