X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=50e8fb214b845fbf71473b85d603fccc4cafc930;hb=e3bbf109946ea22634150c8cce39a3ca43d184f3;hp=159a307b91cfd34131a25e8d89296f9ee5fe0171;hpb=480298cb7c35991ef6cd6c0ec4edae81568a7061;p=modest

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 159a307..50e8fb2 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -485,7 +485,7 @@ modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win)
 		goto cleanup;
 	}
 	
-	account = modest_tny_account_store_get_tny_account_by_account (modest_runtime_get_account_store(),
+	account = modest_tny_account_store_get_server_account (modest_runtime_get_account_store(),
 								       account_name,
 								       TNY_ACCOUNT_TYPE_STORE);
 	if (!account) {
@@ -795,7 +795,7 @@ reply_forward_cb (ModestMailOperation *mail_op,
 		goto cleanup;
 	}
 
-	account = modest_tny_account_store_get_tny_account_by_account (modest_runtime_get_account_store(),
+	account = modest_tny_account_store_get_server_account (modest_runtime_get_account_store(),
 								       rf_helper->account_name,
 								       TNY_ACCOUNT_TYPE_STORE);
 	if (!account) {
@@ -1399,12 +1399,12 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi
 		return;
 	}
 
-	if (!strcmp (account_name, MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID)) {
+	if (!strcmp (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) {
 		account_name = g_strdup (data->account_name);
 	}
 
 	transport_account =
-		TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_tny_account_by_account
+		TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_server_account
 				      (modest_runtime_get_account_store(),
 				       account_name,
 				       TNY_ACCOUNT_TYPE_TRANSPORT));
@@ -1465,9 +1465,10 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
 		g_printerr ("modest: no account found\n");
 		return;
 	}
+	
 	MsgData *data = modest_msg_edit_window_get_msg_data (edit_window);
 
-	if (!strcmp (account_name, MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID)) {
+	if (!strcmp (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) {
 		account_name = g_strdup (data->account_name);
 	}
 	
@@ -2656,6 +2657,7 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action,
 
 	/* Create and run the dialog */
 	dialog = create_move_to_dialog (MODEST_WINDOW (win), folder_view, &tree_view);
+	modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (tree_view));
 	result = gtk_dialog_run (GTK_DIALOG(dialog));
 	g_object_ref (tree_view);