projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2007-06-08 Murray Cumming <murrayc@murrayc.com>
[modest]
/
src
/
modest-ui-actions.c
diff --git
a/src/modest-ui-actions.c
b/src/modest-ui-actions.c
index
159a307
..
50e8fb2
100644
(file)
--- 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;
}
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) {
account_name,
TNY_ACCOUNT_TYPE_STORE);
if (!account) {
@@
-795,7
+795,7
@@
reply_forward_cb (ModestMailOperation *mail_op,
goto cleanup;
}
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) {
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;
}
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 =
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));
(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;
}
g_printerr ("modest: no account found\n");
return;
}
+
MsgData *data = modest_msg_edit_window_get_msg_data (edit_window);
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);
}
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);
/* 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);
result = gtk_dialog_run (GTK_DIALOG(dialog));
g_object_ref (tree_view);