X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=9708e5c3353358e56f4a2ccae75355c9a71ced6c;hp=2e9d795fbb193d6883f09333bcc39d41c5b8d115;hb=7cf7d40552d4509091984e1d647a4983a3205fe4;hpb=38616ccac3e5b84728b703f029111b58746545ac diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index 2e9d795..9708e5c 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -41,7 +41,7 @@ #include #include "modest-error.h" #include "modest-ui-actions.h" - +#include "modest-protocol-info.h" #include "modest-tny-platform-factory.h" #include "modest-platform.h" #include @@ -104,8 +104,8 @@ typedef struct _ReplyForwardHelper { } ReplyForwardHelper; typedef struct _MoveToHelper { - ModestMailOperation *mail_op; - TnyFolder *folder; + GtkTreeRowReference *reference; + GtkWidget *banner; } MoveToHelper; typedef struct _PasteAsAttachmentHelper { @@ -126,12 +126,16 @@ static void do_headers_action (ModestWindow *win, static void open_msg_cb (ModestMailOperation *mail_op, TnyHeader *header, + gboolean canceled, TnyMsg *msg, + GError *err, gpointer user_data); static void reply_forward_cb (ModestMailOperation *mail_op, TnyHeader *header, + gboolean canceled, TnyMsg *msg, + GError *err, gpointer user_data); static void reply_forward (ReplyForwardAction action, ModestWindow *win); @@ -140,14 +144,14 @@ static void folder_refreshed_cb (ModestMailOperation *mail_op, TnyFolder *folder, gpointer user_data); -static void _on_send_receive_progress_changed (ModestMailOperation *mail_op, - ModestMailOperationState *state, - gpointer user_data); +static void on_send_receive_finished (ModestMailOperation *mail_op, + gpointer user_data); static gint header_list_count_uncached_msgs (TnyList *header_list); -static gboolean connect_to_get_msg ( - GtkWindow *win, - gint num_of_uncached_msgs); + +static gboolean connect_to_get_msg (ModestWindow *win, + gint num_of_uncached_msgs, + TnyAccount *account); static gboolean remote_folder_is_pop (const TnyFolderStore *folder); @@ -173,6 +177,11 @@ remote_folder_is_pop (const TnyFolderStore *folder) account = tny_folder_get_account(TNY_FOLDER(folder)); } + if (!account && !TNY_IS_ACCOUNT(account)) { + g_warning ("%s: could not get account", __FUNCTION__); + return FALSE; + } + proto = tny_account_get_proto(account); g_object_unref (account); @@ -203,13 +212,14 @@ msgs_already_deleted_from_server (TnyList *headers, const TnyFolderStore *src_fo * returns: TRUE if an account was created. FALSE if the user cancelled. */ gboolean -modest_run_account_setup_wizard (ModestWindow *win) +modest_ui_actions_run_account_setup_wizard (ModestWindow *win) { - gboolean result = FALSE; - GtkDialog *wizard, *dialog; + gboolean result = FALSE; + GtkWindow *dialog, *wizard; + gint dialog_response; /* Show the easy-setup wizard: */ - dialog = modest_window_mgr_get_modal_dialog (modest_runtime_get_window_mgr()); + dialog = modest_window_mgr_get_modal (modest_runtime_get_window_mgr()); if (dialog && MODEST_IS_EASYSETUP_WIZARD_DIALOG(dialog)) { /* old wizard is active already; */ @@ -218,58 +228,34 @@ modest_run_account_setup_wizard (ModestWindow *win) } - /* there is no such wizard yet */ - - wizard = GTK_DIALOG(modest_easysetup_wizard_dialog_new ()); - if (!wizard) { - g_printerr ("modest: failed to create easysetup wizard\n"); - return FALSE; - } - - modest_window_mgr_set_modal_dialog - (modest_runtime_get_window_mgr(), GTK_DIALOG(wizard)); - - - /* there is no such wizard yet */ - wizard = GTK_DIALOG(modest_easysetup_wizard_dialog_new ()); - modest_window_mgr_set_modal_dialog (modest_runtime_get_window_mgr(), - GTK_DIALOG(wizard)); - - /* make it non-modal; if though we register it as a modal dialog above - * apparently, making it modal *at all* gives hangs -- FIXME: check this*/ - gtk_window_set_modal (GTK_WINDOW(dialog), FALSE); + /* there is no such wizard yet */ + wizard = GTK_WINDOW (modest_easysetup_wizard_dialog_new ()); + modest_window_mgr_set_modal (modest_runtime_get_window_mgr(), wizard); /* always present a main window in the background - * we do it here, so we cannot end up with to wizards (as this + * we do it here, so we cannot end up with two wizards (as this * function might be called in modest_window_mgr_get_main_window as well */ if (!win) - win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr()); - + win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(), + TRUE); /* create if not existent */ + /* make sure the mainwindow is visible */ + gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (win)); gtk_widget_show_all (GTK_WIDGET(win)); gtk_window_present (GTK_WINDOW(win)); - - gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (win)); + dialog_response = gtk_dialog_run (GTK_DIALOG (wizard)); + gtk_widget_destroy (GTK_WIDGET (wizard)); + if (gtk_events_pending ()) + gtk_main_iteration (); - /* Don't make this a modal window, because secondary windows will then - * be unusable, freezing the UI: */ - /* gtk_window_set_modal (GTK_WINDOW (wizard), TRUE); */ - - gint dialog_response = gtk_dialog_run (GTK_DIALOG (wizard)); - if (dialog_response == GTK_RESPONSE_CANCEL) + if (dialog_response == GTK_RESPONSE_CANCEL) { result = FALSE; - else { + } else { /* Check whether an account was created: */ result = modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE); } - gtk_widget_destroy (GTK_WIDGET (wizard)); - - /* clear it from the window mgr */ - modest_window_mgr_set_modal_dialog - (modest_runtime_get_window_mgr(), NULL); - return result; } @@ -338,6 +324,35 @@ get_selected_headers (ModestWindow *win) return NULL; } +static GtkTreeRowReference * +get_next_after_selected_headers (ModestHeaderView *header_view) +{ + GtkTreeSelection *sel; + GList *selected_rows, *node; + GtkTreePath *path; + GtkTreeRowReference *result; + GtkTreeModel *model; + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)); + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (header_view)); + selected_rows = gtk_tree_selection_get_selected_rows (sel, NULL); + + if (selected_rows == NULL) + return NULL; + + node = g_list_last (selected_rows); + path = gtk_tree_path_copy ((GtkTreePath *) node->data); + gtk_tree_path_next (path); + + result = gtk_tree_row_reference_new (model, path); + + gtk_tree_path_free (path); + g_list_foreach (selected_rows, (GFunc) gtk_tree_path_free, NULL); + g_list_free (selected_rows); + + return result; +} + static void headers_action_mark_as_read (TnyHeader *header, ModestWindow *win, @@ -349,7 +364,7 @@ headers_action_mark_as_read (TnyHeader *header, flags = tny_header_get_flags (header); if (flags & TNY_HEADER_FLAG_SEEN) return; - tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN); + tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN); } static void @@ -363,44 +378,10 @@ headers_action_mark_as_unread (TnyHeader *header, flags = tny_header_get_flags (header); if (flags & TNY_HEADER_FLAG_SEEN) { - tny_header_unset_flags (header, TNY_HEADER_FLAG_SEEN); + tny_header_unset_flag (header, TNY_HEADER_FLAG_SEEN); } } -/** A convenience method, because deleting a message is - * otherwise complicated, and it's best to change it in one place - * when we change it. - */ -void modest_do_message_delete (TnyHeader *header, ModestWindow *win) -{ - ModestMailOperation *mail_op = NULL; - mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_DELETE, - win ? G_OBJECT(win) : NULL); - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), - mail_op); - - /* Always delete. TODO: Move to trash still not supported */ - modest_mail_operation_remove_msg (mail_op, header, FALSE); - g_object_unref (G_OBJECT (mail_op)); -} - -/** A convenience method, because deleting a message is - * otherwise complicated, and it's best to change it in one place - * when we change it. - */ -void modest_do_messages_delete (TnyList *headers, ModestWindow *win) -{ - ModestMailOperation *mail_op = NULL; - mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_DELETE, - win ? G_OBJECT(win) : NULL); - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), - mail_op); - - /* Always delete. TODO: Move to trash still not supported */ - modest_mail_operation_remove_msgs (mail_op, headers, FALSE); - g_object_unref (G_OBJECT (mail_op)); -} - /** After deleing a message that is currently visible in a window, * show the next message from the list, or close the window if there are no more messages. **/ @@ -417,6 +398,7 @@ modest_ui_actions_refresh_message_window_after_delete (ModestMsgViewWindow* win) } } + void modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) { @@ -505,7 +487,7 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) GtkTreeRowReference *prev_row_reference = NULL; GtkTreePath *next_path = NULL; GtkTreePath *prev_path = NULL; - GError *err = NULL; + ModestMailOperation *mail_op = NULL; /* Find last selected row */ if (MODEST_IS_MAIN_WINDOW (win)) { @@ -530,7 +512,11 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) modest_window_disable_dimming (MODEST_WINDOW(win)); /* Remove each header. If it's a view window header_view == NULL */ - modest_do_messages_delete (header_list, win); + mail_op = modest_mail_operation_new ((GObject *) win); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), + mail_op); + modest_mail_operation_remove_msgs (mail_op, header_list, FALSE); + g_object_unref (mail_op); /* Enable window dimming management */ if (sel != NULL) { @@ -543,9 +529,8 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) /* Get main window */ mgr = modest_runtime_get_window_mgr (); - main_window = modest_window_mgr_get_main_window (mgr); - } - else { + main_window = modest_window_mgr_get_main_window (mgr, FALSE); /* don't create */ + } else { /* Move cursor to next row */ main_window = win; @@ -568,14 +553,10 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) if (prev_path != NULL) gtk_tree_path_free (prev_path); } - - if (err != NULL) { - printf ("DEBUG: %s: Error: code=%d, text=%s\n", __FUNCTION__, err->code, err->message); - g_error_free(err); - } /* Update toolbar dimming state */ - modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window)); + if (main_window) + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window)); /* Free */ g_list_foreach (sel_list, (GFunc) gtk_tree_path_free, NULL); @@ -682,21 +663,24 @@ modest_ui_actions_on_add_to_contacts (GtkAction *action, ModestWindow *win) } void -modest_ui_actions_on_accounts (GtkAction *action, ModestWindow *win) +modest_ui_actions_on_accounts (GtkAction *action, + ModestWindow *win) { /* This is currently only implemented for Maemo */ #ifdef MODEST_PLATFORM_MAEMO /* Defined in config.h */ - if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE)) { - modest_run_account_setup_wizard (win); + if (!modest_account_mgr_has_accounts (modest_runtime_get_account_mgr(), TRUE)) { + if (!modest_ui_actions_run_account_setup_wizard (win)) + g_debug ("%s: wizard was already running", __FUNCTION__); + return; - } else { - /* Show the list of accounts: */ - GtkDialog *account_win = GTK_DIALOG(modest_account_view_window_new ()); - gtk_window_set_transient_for (GTK_WINDOW (account_win), GTK_WINDOW (win)); + } else { + /* Show the list of accounts */ + GtkWindow *account_win = GTK_WINDOW (modest_account_view_window_new ()); + gtk_window_set_transient_for (account_win, GTK_WINDOW (win)); - /* The accounts dialog must be modal */ - gtk_window_set_modal (GTK_WINDOW (account_win), TRUE); - modest_maemo_show_dialog_and_forget (GTK_WINDOW (win), account_win); + /* The accounts dialog must be modal */ + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), account_win); + modest_maemo_show_dialog_and_forget (GTK_WINDOW (win), GTK_DIALOG (account_win)); } #else GtkWidget *dialog, *label; @@ -763,94 +747,95 @@ modest_ui_actions_on_smtp_servers (GtkAction *action, ModestWindow *win) } void -modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win) +modest_ui_actions_compose_msg(ModestWindow *win, + const gchar *to_str, + const gchar *cc_str, + const gchar *bcc_str, + const gchar *subject_str, + const gchar *body_str, + GSList *attachments) { - ModestWindow *msg_win = NULL; - TnyMsg *msg = NULL; - TnyFolder *folder = NULL; gchar *account_name = NULL; - gchar *from_str = NULL; -/* GError *err = NULL; */ + TnyMsg *msg = NULL; TnyAccount *account = NULL; - ModestWindowMgr *mgr; - gchar *signature = NULL, *blank_and_signature = NULL; + TnyFolder *folder = NULL; + gchar *from_str = NULL, *signature = NULL, *body = NULL; + gboolean use_signature = FALSE; + ModestWindow *msg_win = NULL; + ModestAccountMgr *mgr = modest_runtime_get_account_mgr(); + ModestTnyAccountStore *store = modest_runtime_get_account_store(); - /* if there are no accounts yet, just show the wizard */ - if (!modest_account_mgr_has_accounts (modest_runtime_get_account_mgr(), TRUE)) { - const gboolean created = modest_run_account_setup_wizard (win); - if (!created) - return; - } - - account_name = g_strdup (modest_window_get_active_account (win)); - if (!account_name) - account_name = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr ()); + if (win) account_name = g_strdup (modest_window_get_active_account (win)); + if (!account_name) account_name = modest_account_mgr_get_default_account(mgr); if (!account_name) { g_printerr ("modest: no account found\n"); goto cleanup; } - - account = modest_tny_account_store_get_server_account (modest_runtime_get_account_store(), - account_name, - TNY_ACCOUNT_TYPE_STORE); + account = modest_tny_account_store_get_server_account (store, account_name, TNY_ACCOUNT_TYPE_STORE); if (!account) { g_printerr ("modest: failed to get tnyaccount for '%s'\n", account_name); goto cleanup; } - - from_str = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(), account_name); + folder = modest_tny_account_get_special_folder (account, TNY_FOLDER_TYPE_DRAFTS); + if (!folder) { + g_printerr ("modest: failed to find Drafts folder\n"); + goto cleanup; + } + from_str = modest_account_mgr_get_from_string (mgr, account_name); if (!from_str) { g_printerr ("modest: failed get from string for '%s'\n", account_name); goto cleanup; } - gboolean use_signature = FALSE; - signature = modest_account_mgr_get_signature (modest_runtime_get_account_mgr (), account_name, &use_signature); - - if (use_signature) { - blank_and_signature = g_strconcat ("\n", signature, NULL); + signature = modest_account_mgr_get_signature (mgr, account_name, &use_signature); + if (body_str != NULL) { + body = use_signature ? g_strconcat(body_str, "\n", signature, NULL) : g_strdup(body_str); } else { - blank_and_signature = g_strdup (""); + body = use_signature ? g_strconcat("\n", signature, NULL) : g_strdup(""); } - g_free (signature); - - msg = modest_tny_msg_new ("", from_str, "", "", "", blank_and_signature, NULL); + msg = modest_tny_msg_new (to_str, from_str, cc_str, bcc_str, subject_str, body, NULL); if (!msg) { g_printerr ("modest: failed to create new msg\n"); goto cleanup; } - - folder = modest_tny_account_get_special_folder (account, TNY_FOLDER_TYPE_DRAFTS); - if (!folder) { - g_printerr ("modest: failed to find Drafts folder\n"); - goto cleanup; - } - - + /* Create and register edit window */ /* This is destroyed by TODO. */ msg_win = modest_msg_edit_window_new (msg, account_name, FALSE); - mgr = modest_runtime_get_window_mgr (); - modest_window_mgr_register_window (mgr, msg_win); + while (attachments) { + modest_msg_edit_window_attach_file_one((ModestMsgEditWindow *)msg_win, + attachments->data); + attachments = g_slist_next(attachments); + } + modest_window_mgr_register_window (modest_runtime_get_window_mgr(), msg_win); - if (win) + if (win) { gtk_window_set_transient_for (GTK_WINDOW (msg_win), GTK_WINDOW (win)); + } gtk_widget_show_all (GTK_WIDGET (msg_win)); cleanup: - g_free (account_name); g_free (from_str); - g_free (blank_and_signature); - if (msg_win) - g_object_unref (msg_win); - if (account) - g_object_unref (G_OBJECT(account)); - if (msg) - g_object_unref (G_OBJECT(msg)); - if (folder) - g_object_unref (G_OBJECT(folder)); + g_free (signature); + g_free (body); + g_free (account_name); + if (account) g_object_unref (G_OBJECT(account)); + if (folder) g_object_unref (G_OBJECT(folder)); + if (msg_win) g_object_unref (G_OBJECT(msg_win)); + if (msg) g_object_unref (G_OBJECT(msg)); +} + +void +modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win) +{ + /* if there are no accounts yet, just show the wizard */ + if (!modest_account_mgr_has_accounts (modest_runtime_get_account_mgr(), TRUE)) + if (!modest_ui_actions_run_account_setup_wizard (win)) + return; + + modest_ui_actions_compose_msg(win, NULL, NULL, NULL, NULL, NULL, NULL); } gboolean @@ -875,7 +860,12 @@ modest_ui_actions_msg_retrieval_check (ModestMailOperation *mail_op, } static void -open_msg_cb (ModestMailOperation *mail_op, TnyHeader *header, TnyMsg *msg, gpointer user_data) +open_msg_cb (ModestMailOperation *mail_op, + TnyHeader *header, + gboolean canceled, + TnyMsg *msg, + GError *err, + gpointer user_data) { ModestWindowMgr *mgr = NULL; ModestWindow *parent_win = NULL; @@ -883,6 +873,7 @@ open_msg_cb (ModestMailOperation *mail_op, TnyHeader *header, TnyMsg *msg, gpoi TnyFolderType folder_type = TNY_FOLDER_TYPE_UNKNOWN; gchar *account = NULL; TnyFolder *folder; + gboolean open_in_editor = FALSE; /* Do nothing if there was any problem with the mail operation. The error will be shown by the error_handler of @@ -896,25 +887,76 @@ open_msg_cb (ModestMailOperation *mail_op, TnyHeader *header, TnyMsg *msg, gpoi /* Mark header as read */ headers_action_mark_as_read (header, MODEST_WINDOW(parent_win), NULL); + /* Gets folder type (OUTBOX headers will be opened in edit window */ + if (modest_tny_folder_is_local_folder (folder)) { + folder_type = modest_tny_folder_get_local_or_mmc_folder_type (folder); + if (folder_type == TNY_FOLDER_TYPE_INVALID) + g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__); + } + + + if (folder_type == TNY_FOLDER_TYPE_OUTBOX) { + TnyTransportAccount *traccount = NULL; + ModestTnyAccountStore *accstore = modest_runtime_get_account_store(); + traccount = modest_tny_account_store_get_transport_account_from_outbox_header(accstore, header); + if (traccount) { + ModestTnySendQueue *send_queue = NULL; + ModestTnySendQueueStatus status; + char *msg_id; + account = g_strdup(modest_tny_account_get_parent_modest_account_name_for_server_account( + TNY_ACCOUNT(traccount))); + send_queue = modest_runtime_get_send_queue(traccount); + msg_id = modest_tny_send_queue_get_msg_id (header); + status = modest_tny_send_queue_get_msg_status(send_queue, msg_id); + /* Only open messages in outbox with the editor if they are in Failed state */ + if (status == MODEST_TNY_SEND_QUEUE_FAILED) { + open_in_editor = TRUE; + } + g_free(msg_id); + g_object_unref(traccount); + } else { + g_warning("Cannot get transport account for message in outbox!!"); + } + } else if (folder_type == TNY_FOLDER_TYPE_DRAFTS) { + open_in_editor = TRUE; /* Open in editor if the message is in the Drafts folder */ + } + /* Get account */ - account = g_strdup (modest_window_get_active_account (MODEST_WINDOW (parent_win))); + if (!account) + account = g_strdup (modest_window_get_active_account (MODEST_WINDOW (parent_win))); if (!account) account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr()); - /* Gets folder type (OUTBOX headers will be opened in edit window */ - if (modest_tny_folder_is_local_folder (folder)) - folder_type = modest_tny_folder_get_local_or_mmc_folder_type (folder); + if (open_in_editor) { + ModestAccountMgr *mgr = modest_runtime_get_account_mgr (); + const gchar *from_header = NULL; + + from_header = tny_header_get_from (header); - /* If the header is in the drafts folder then open the editor, - else the message view window */ - if ((folder_type == TNY_FOLDER_TYPE_DRAFTS) || - (folder_type == TNY_FOLDER_TYPE_OUTBOX)) { /* we cannot edit without a valid account... */ - if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE)) { - const gboolean created = modest_run_account_setup_wizard(parent_win); - if (!created) + if (!modest_account_mgr_has_accounts(mgr, TRUE)) { + if (!modest_ui_actions_run_account_setup_wizard(parent_win)) goto cleanup; } + + if (from_header) { + GSList *accounts = modest_account_mgr_account_names (mgr, TRUE); + GSList *node = NULL; + for (node = accounts; node != NULL; node = g_slist_next (node)) { + gchar *from = modest_account_mgr_get_from_string (mgr, node->data); + + if (from && (strcmp (from_header, from) == 0)) { + g_free (account); + account = g_strdup (node->data); + g_free (from); + break; + } + g_free (from); + } + g_slist_foreach (accounts, (GFunc) g_free, NULL); + g_slist_free (accounts); + } + win = modest_msg_edit_window_new (msg, account, TRUE); @@ -961,7 +1003,6 @@ open_msg_cb (ModestMailOperation *mail_op, TnyHeader *header, TnyMsg *msg, gpoi mgr = modest_runtime_get_window_mgr (); modest_window_mgr_register_window (mgr, win); g_object_unref (win); - gtk_window_set_transient_for (GTK_WINDOW (win), GTK_WINDOW (parent_win)); gtk_widget_show_all (GTK_WIDGET(win)); } @@ -982,37 +1023,121 @@ modest_ui_actions_get_msgs_full_error_handler (ModestMailOperation *mail_op, gpointer user_data) { const GError *error; - GObject *win = modest_mail_operation_get_source (mail_op); + GObject *win = NULL; + const gchar *err_msg; + win = modest_mail_operation_get_source (mail_op); error = modest_mail_operation_get_error (mail_op); -/* printf ("DEBUG: %s: Error: code=%d, text=%s\n", __FUNCTION__, error->code, error->message); */ - if (error->code == MODEST_MAIL_OPERATION_ERROR_MESSAGE_SIZE_LIMIT) { + /* Select error message */ + if (error->code == MODEST_MAIL_OPERATION_ERROR_MESSAGE_SIZE_LIMIT) + err_msg = _("emev_ni_ui_imap_msg_size_exceed_error"); + else + err_msg = (const gchar *) user_data; - modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL, - error->message); - } else { - modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL, - _("mail_ni_ui_folder_get_msg_folder_error")); - } + /* Show error */ + modest_platform_run_information_dialog ((GtkWindow *) win, err_msg); if (win) g_object_unref (win); } +/** + * Returns the account a list of headers belongs to. It returns a + * *new* reference so don't forget to unref it + */ +static TnyAccount* +get_account_from_header_list (TnyList *headers) +{ + TnyAccount *account = NULL; + + if (tny_list_get_length (headers) > 0) { + TnyIterator *iter = tny_list_create_iterator (headers); + TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter)); + TnyFolder *folder = tny_header_get_folder (header); + account = tny_folder_get_account (folder); + g_object_unref (folder); + g_object_unref (header); + g_object_unref (iter); + } + return account; +} + +static void +open_msgs_performer(gboolean canceled, + GError *err, + GtkWindow *parent_window, + TnyAccount *account, + gpointer user_data) +{ + ModestMailOperation *mail_op; + const gchar *proto_name; + gchar *error_msg; + ModestTransportStoreProtocol proto; + TnyList *not_opened_headers; + + not_opened_headers = TNY_LIST (user_data); + + /* Get the error message depending on the protocol */ + proto_name = tny_account_get_proto (account); + if (proto_name != NULL) { + proto = modest_protocol_info_get_transport_store_protocol (proto_name); + } else { + proto = MODEST_PROTOCOL_STORE_MAILDIR; + } + + /* Create the error messages */ + if (tny_list_get_length (not_opened_headers) == 1) { + if (proto == MODEST_PROTOCOL_STORE_POP) { + error_msg = g_strdup (_("emev_ni_ui_pop3_msg_recv_error")); + } else if (proto == MODEST_PROTOCOL_STORE_IMAP) { + TnyIterator *iter = tny_list_create_iterator (not_opened_headers); + TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter)); + error_msg = g_strdup_printf (_("emev_ni_ui_imap_message_not_available_in_server"), + tny_header_get_subject (header)); + g_object_unref (header); + g_object_unref (iter); + } else { + error_msg = g_strdup (_("mail_ni_ui_folder_get_msg_folder_error")); + } + } else { + error_msg = g_strdup (_("mail_ni_ui_folder_get_msg_folder_error")); + } + + /* Create the mail operation */ + mail_op = + modest_mail_operation_new_with_error_handling ((GObject *) parent_window, + modest_ui_actions_get_msgs_full_error_handler, + error_msg, g_free); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), + mail_op); + + modest_mail_operation_get_msgs_full (mail_op, + not_opened_headers, + open_msg_cb, + NULL, + NULL); + + /* Frees */ + g_object_unref (mail_op); + g_object_unref (not_opened_headers); + g_object_unref (account); +} + /* * This function is used by both modest_ui_actions_on_open and * modest_ui_actions_on_header_activated. This way we always do the * same when trying to open messages. */ static void -_modest_ui_actions_open (TnyList *headers, ModestWindow *win) +open_msgs_from_headers (TnyList *headers, ModestWindow *win) { ModestWindowMgr *mgr = NULL; - TnyIterator *iter = NULL; - ModestMailOperation *mail_op = NULL; + TnyIterator *iter = NULL, *iter_not_opened = NULL; TnyList *not_opened_headers = NULL; TnyHeaderFlags flags = 0; + TnyAccount *account; + gint uncached_msgs = 0; g_return_if_fail (headers != NULL); @@ -1023,14 +1148,16 @@ _modest_ui_actions_open (TnyList *headers, ModestWindow *win) return; } + mgr = modest_runtime_get_window_mgr (); + iter = tny_list_create_iterator (headers); + /* Get the account */ + account = get_account_from_header_list (headers); + /* Look if we already have a message view for each header. If true, then remove the header from the list of headers to open */ - mgr = modest_runtime_get_window_mgr (); - iter = tny_list_create_iterator (headers); not_opened_headers = tny_simple_list_new (); - while (!tny_iterator_is_done (iter)) { ModestWindow *window = NULL; @@ -1064,72 +1191,63 @@ _modest_ui_actions_open (TnyList *headers, ModestWindow *win) } g_object_unref (iter); iter = NULL; + + /* Open each message */ + if (tny_list_get_length (not_opened_headers) == 0) + goto cleanup; /* If some messages would have to be downloaded, ask the user to * make a connection. It's generally easier to do this here (in the mainloop) * than later in a thread: */ if (tny_list_get_length (not_opened_headers) > 0) { - TnyIterator *iter; - gboolean found = FALSE; - - iter = tny_list_create_iterator (not_opened_headers); - while (!tny_iterator_is_done (iter) && !found) { - TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter)); - if (!(tny_header_get_flags (header) & TNY_HEADER_FLAG_CACHED)) - found = TRUE; - else - tny_iterator_next (iter); - - g_object_unref (header); - } - g_object_unref (iter); - - if (found && !modest_platform_connect_and_wait (GTK_WINDOW (win), NULL)) { - g_object_unref (not_opened_headers); - return; + uncached_msgs = header_list_count_uncached_msgs (not_opened_headers); + + if (uncached_msgs > 0) { + /* Allways download if we are online. */ + if (!tny_device_is_online (modest_runtime_get_device ())) { + gint response; + + /* If ask for user permission to download the messages */ + response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win), + ngettext("mcen_nc_get_msg", + "mcen_nc_get_msgs", + uncached_msgs)); + + /* End if the user does not want to continue */ + if (response == GTK_RESPONSE_CANCEL) + goto cleanup; + } } } /* Register the headers before actually creating the windows: */ - TnyIterator *iter_not_opened = tny_list_create_iterator (not_opened_headers); + iter_not_opened = tny_list_create_iterator (not_opened_headers); while (!tny_iterator_is_done (iter_not_opened)) { TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter_not_opened)); if (header) { - modest_window_mgr_register_header (mgr, header); + modest_window_mgr_register_header (mgr, header, NULL); g_object_unref (header); } - tny_iterator_next (iter_not_opened); } g_object_unref (iter_not_opened); iter_not_opened = NULL; - - /* Open each message */ - if (tny_list_get_length (not_opened_headers) > 0) { - mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, - G_OBJECT (win), - modest_ui_actions_get_msgs_full_error_handler, - NULL); - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); - if (tny_list_get_length (not_opened_headers) > 1) { - modest_mail_operation_get_msgs_full (mail_op, - not_opened_headers, - open_msg_cb, - NULL, - NULL); - } else { - TnyIterator *iter = tny_list_create_iterator (not_opened_headers); - TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter)); - modest_mail_operation_get_msg (mail_op, header, open_msg_cb, NULL); - g_object_unref (header); - g_object_unref (iter); - } - g_object_unref (mail_op); - } + /* Connect to the account and perform */ + if (uncached_msgs > 0) { + modest_platform_connect_and_perform ((GtkWindow *) win, g_object_ref (account), + open_msgs_performer, g_object_ref (not_opened_headers)); + } else { + /* Call directly the performer, do not need to connect */ + open_msgs_performer (FALSE, NULL, (GtkWindow *) win, g_object_ref (account), + g_object_ref (not_opened_headers)); + } +cleanup: /* Clean */ - if (not_opened_headers != NULL) + if (account) + g_object_unref (account); + if (not_opened_headers) g_object_unref (not_opened_headers); } @@ -1144,7 +1262,7 @@ modest_ui_actions_on_open (GtkAction *action, ModestWindow *win) return; /* Open them */ - _modest_ui_actions_open (headers, win); + open_msgs_from_headers (headers, win); g_object_unref(headers); } @@ -1161,7 +1279,11 @@ free_reply_forward_helper (gpointer data) } static void -reply_forward_cb (ModestMailOperation *mail_op, TnyHeader *header, TnyMsg *msg, +reply_forward_cb (ModestMailOperation *mail_op, + TnyHeader *header, + gboolean canceled, + TnyMsg *msg, + GError *err, gpointer user_data) { TnyMsg *new_msg; @@ -1172,6 +1294,7 @@ reply_forward_cb (ModestMailOperation *mail_op, TnyHeader *header, TnyMsg *msg, TnyAccount *account = NULL; ModestWindowMgr *mgr = NULL; gchar *signature = NULL; + gboolean use_signature; /* If there was any error. The mail operation could be NULL, this means that we already have the message downloaded and @@ -1184,13 +1307,9 @@ reply_forward_cb (ModestMailOperation *mail_op, TnyHeader *header, TnyMsg *msg, from = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(), rf_helper->account_name); - if (modest_account_mgr_get_bool (modest_runtime_get_account_mgr(), - rf_helper->account_name, - MODEST_ACCOUNT_USE_SIGNATURE, FALSE)) { - signature = modest_account_mgr_get_string (modest_runtime_get_account_mgr (), - rf_helper->account_name, - MODEST_ACCOUNT_SIGNATURE, FALSE); - } + signature = modest_account_mgr_get_signature (modest_runtime_get_account_mgr(), + rf_helper->account_name, + &use_signature); /* Create reply mail */ switch (rf_helper->action) { @@ -1288,23 +1407,26 @@ header_list_count_uncached_msgs (TnyList *header_list) * messages. Returns TRUE if the user allowed the download. */ static gboolean -connect_to_get_msg (GtkWindow *win, - gint num_of_uncached_msgs) +connect_to_get_msg (ModestWindow *win, + gint num_of_uncached_msgs, + TnyAccount *account) { + GtkResponseType response; + /* Allways download if we are online. */ if (tny_device_is_online (modest_runtime_get_device ())) return TRUE; /* If offline, then ask for user permission to download the messages */ - GtkResponseType response; response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win), ngettext("mcen_nc_get_msg", "mcen_nc_get_msgs", num_of_uncached_msgs)); + if (response == GTK_RESPONSE_CANCEL) return FALSE; - return modest_platform_connect_and_wait(win, NULL); + return modest_platform_connect_and_wait((GtkWindow *) win, account); } /* @@ -1324,8 +1446,7 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) /* we need an account when editing */ if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE)) { - const gboolean created = modest_run_account_setup_wizard (win); - if (!created) + if (!modest_ui_actions_run_account_setup_wizard (win)) return; } @@ -1344,14 +1465,16 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) if (do_retrieve){ gint num_of_unc_msgs; + /* check that the messages have been previously downloaded */ num_of_unc_msgs = header_list_count_uncached_msgs(header_list); /* If there are any uncached message ask the user * whether he/she wants to download them. */ - if (num_of_unc_msgs) - continue_download = connect_to_get_msg ( - GTK_WINDOW (win), - num_of_unc_msgs); + if (num_of_unc_msgs) { + TnyAccount *account = get_account_from_header_list (header_list); + continue_download = connect_to_get_msg (win, num_of_unc_msgs, account); + g_object_unref (account); + } } if (!continue_download) { @@ -1389,7 +1512,7 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) g_printerr ("modest: no message found\n"); return; } else { - reply_forward_cb (NULL, header, msg, rf_helper); + reply_forward_cb (NULL, header, FALSE, msg, NULL, rf_helper); } if (header) g_object_unref (header); @@ -1405,11 +1528,10 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) if (header) { /* Retrieve messages */ if (do_retrieve) { - mail_op = modest_mail_operation_new_with_error_handling ( - MODEST_MAIL_OPERATION_TYPE_RECEIVE, - G_OBJECT(win), - modest_ui_actions_get_msgs_full_error_handler, - NULL); + mail_op = + modest_mail_operation_new_with_error_handling (G_OBJECT(win), + modest_ui_actions_get_msgs_full_error_handler, + NULL, NULL); modest_mail_operation_queue_add ( modest_runtime_get_mail_operation_queue (), mail_op); @@ -1422,7 +1544,7 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) } else { /* we put a ref here to prevent double unref as the reply * forward callback unrefs the header at its end */ - reply_forward_cb (NULL, header, NULL, rf_helper); + reply_forward_cb (NULL, header, FALSE, NULL, NULL, rf_helper); } @@ -1529,47 +1651,71 @@ new_messages_arrived (ModestMailOperation *self, TnyList *new_headers, gpointer user_data) { - ModestMainWindow *win = NULL; - GtkWidget *folder_view = NULL; - TnyFolderStore *folder = NULL; - gboolean folder_empty = FALSE; + GObject *source; - g_return_if_fail (MODEST_IS_MAIN_WINDOW (user_data)); - win = MODEST_MAIN_WINDOW (user_data); + source = modest_mail_operation_get_source (self); - /* Don't do anything if there are not new headers, this could - happen if there was any problem with the mail operation */ - if (!new_headers) - return; + /* Notify new messages have been downloaded. Do not notify if + the send&receive was invoked by the user, i.e, if the mail + operation has a source (the main window) */ + if ((new_headers != NULL) && (tny_list_get_length (new_headers) > 0) && !source) + modest_platform_on_new_headers_received (new_headers); - /* Set contents style of headers view */ - if (modest_main_window_get_contents_style (win) == MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY) { - folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); - folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view)); - + if (source) + g_object_unref (source); +} - folder_empty = (tny_folder_get_all_count (TNY_FOLDER (folder)) == 0); - - if (!folder_empty) - modest_main_window_set_contents_style (win, - MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS); - } +typedef struct { + TnyAccount *account; + ModestWindow *win; + gchar *account_name; +} SendReceiveInfo; - /* Notify new messages have been downloaded */ - if ((new_headers != NULL) && (tny_list_get_length (new_headers) > 0)) { - TnyIterator *iter = tny_list_create_iterator (new_headers); - do { - TnyHeader *header = NULL; +static void +do_send_receive_performer (gboolean canceled, + GError *err, + GtkWindow *parent_window, + TnyAccount *account, + gpointer user_data) +{ + ModestMailOperation *mail_op; + SendReceiveInfo *info; - header = TNY_HEADER (tny_iterator_get_current (iter)); - modest_platform_on_new_header_received (header); - g_object_unref (header); + info = (SendReceiveInfo *) user_data; - tny_iterator_next (iter); - } while (!tny_iterator_is_done (iter)); - g_object_unref (iter); + if (err || canceled) { + + goto clean; + } + + /* Set send/receive operation in progress */ + if (info->win && MODEST_IS_MAIN_WINDOW (info->win)) { + modest_main_window_notify_send_receive_initied (MODEST_MAIN_WINDOW (info->win)); } + + mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT (info->win), + modest_ui_actions_send_receive_error_handler, + NULL, NULL); + + if (info->win && MODEST_IS_MAIN_WINDOW (info->win)) + g_signal_connect (G_OBJECT(mail_op), "operation-finished", + G_CALLBACK (on_send_receive_finished), + info->win); + + /* Send & receive. */ + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); + modest_mail_operation_update_account (mail_op, info->account_name, new_messages_arrived, info->win); + g_object_unref (G_OBJECT (mail_op)); + + clean: + /* Frees */ + if (info->account_name) + g_free (info->account_name); + if (info->win) + g_object_unref (info->win); + if (info->account) + g_object_unref (info->account); + g_slice_free (SendReceiveInfo, info); } /* @@ -1579,16 +1725,18 @@ new_messages_arrived (ModestMailOperation *self, * be more flexible. */ void -modest_ui_actions_do_send_receive (const gchar *account_name, ModestWindow *win) +modest_ui_actions_do_send_receive (const gchar *account_name, + ModestWindow *win) { gchar *acc_name = NULL; - ModestMailOperation *mail_op; - TnyAccount *store_account = NULL; + SendReceiveInfo *info; + ModestTnyAccountStore *acc_store; /* If no account name was provided then get the current account, and if there is no current account then pick the default one: */ if (!account_name) { - acc_name = g_strdup (modest_window_get_active_account(win)); + if (win) + acc_name = g_strdup (modest_window_get_active_account (win)); if (!acc_name) acc_name = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr()); if (!acc_name) { @@ -1599,43 +1747,18 @@ modest_ui_actions_do_send_receive (const gchar *account_name, ModestWindow *win) acc_name = g_strdup (account_name); } + acc_store = modest_runtime_get_account_store (); - /* Ensure that we have a connection available */ - store_account = - modest_tny_account_store_get_server_account (modest_runtime_get_account_store (), - acc_name, - TNY_ACCOUNT_TYPE_STORE); - if (!modest_platform_connect_and_wait (NULL, TNY_ACCOUNT (store_account))) { - g_object_unref (store_account); - return; - } - g_object_unref (store_account); - - /* Set send/receive operation in progress */ - modest_main_window_notify_send_receive_initied (MODEST_MAIN_WINDOW(win)); + /* Create the info for the connect and perform */ + info = g_slice_new (SendReceiveInfo); + info->account_name = acc_name; + info->win = (win) ? g_object_ref (win) : NULL; + info->account = modest_tny_account_store_get_server_account (acc_store, acc_name, + TNY_ACCOUNT_TYPE_STORE); - mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, - G_OBJECT (win), - modest_ui_actions_send_receive_error_handler, - NULL); - - g_signal_connect (G_OBJECT(mail_op), "progress-changed", - G_CALLBACK (_on_send_receive_progress_changed), - win); - - /* Send & receive. */ - /* TODO: The spec wants us to first do any pending deletions, before receiving. */ - /* Receive and then send. The operation is tagged initially as - a receive operation because the account update performs a - receive and then a send. The operation changes its type - internally, so the progress objects will receive the proper - progress information */ - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); - modest_mail_operation_update_account (mail_op, acc_name, new_messages_arrived, win); - g_object_unref (G_OBJECT (mail_op)); - - /* Free */ - g_free (acc_name); + /* Invoke the connect and perform */ + modest_platform_connect_and_perform ((win) ? GTK_WINDOW (win) : NULL, info->account, + do_send_receive_performer, info); } @@ -1730,47 +1853,6 @@ modest_ui_actions_do_send_receive_all (ModestWindow *win) account_names = NULL; } -void -modest_do_refresh_current_folder(ModestWindow *win) -{ - /* Refresh currently selected folder. Note that if we only - want to retreive the headers, then the refresh only will - invoke a poke_status over all folders, i.e., only the - total/unread count will be updated */ - if (MODEST_IS_MAIN_WINDOW (win)) { - GtkWidget *header_view, *folder_view; - TnyFolderStore *folder_store; - - /* Get folder and header view */ - folder_view = - modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); - if (!folder_view) - return; - - folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); - - if (folder_store && TNY_IS_FOLDER (folder_store)) { - header_view = - modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); - - /* We do not need to set the contents style - because it hasn't changed. We also do not - need to save the widget status. Just force - a refresh */ - modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view), - TNY_FOLDER (folder_store), - folder_refreshed_cb, - MODEST_MAIN_WINDOW (win)); - } - - if (folder_store) - g_object_unref (folder_store); - } -} - - /* * Handler of the click on Send&Receive button in the main toolbar */ @@ -1784,8 +1866,6 @@ modest_ui_actions_on_send_receive (GtkAction *action, ModestWindow *win) /* If not, allow the user to create an account before trying to send/receive. */ if (!accounts_exist) modest_ui_actions_on_accounts (NULL, win); - - modest_do_refresh_current_folder (win); /* Refresh the active account */ modest_ui_actions_do_send_receive (NULL, win); @@ -1871,12 +1951,17 @@ modest_ui_actions_on_header_activated (ModestHeaderView *header_view, if (!header) return; + if (modest_header_view_count_selected_headers (header_view) > 1) { + hildon_banner_show_information (NULL, NULL, _("mcen_ib_select_one_message")); + return; + } + /* headers = tny_simple_list_new (); */ /* tny_list_prepend (headers, G_OBJECT (header)); */ headers = modest_header_view_get_selected_headers (header_view); - _modest_ui_actions_open (headers, MODEST_WINDOW (main_window)); + open_msgs_from_headers (headers, MODEST_WINDOW (main_window)); g_object_unref (headers); } @@ -2106,6 +2191,34 @@ modest_ui_actions_on_msg_recpt_activated (ModestMsgView *msgview, /* g_message ("%s %s", __FUNCTION__, address); */ } +static void +on_save_to_drafts_cb (ModestMailOperation *mail_op, + TnyMsg *saved_draft, + gpointer user_data) +{ + ModestMsgEditWindow *edit_window; + ModestMainWindow *win; + + /* FIXME. Make the header view sensitive again. This is a + * temporary hack. See modest_ui_actions_on_save_to_drafts() + * for details */ + win = MODEST_MAIN_WINDOW(modest_window_mgr_get_main_window( + modest_runtime_get_window_mgr(), FALSE)); + if (win != NULL) { + GtkWidget *hdrview = modest_main_window_get_child_widget( + win, MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); + if (hdrview) gtk_widget_set_sensitive(hdrview, TRUE); + } + + edit_window = MODEST_MSG_EDIT_WINDOW (user_data); + + /* If there was any error do nothing */ + if (modest_mail_operation_get_error (mail_op) != NULL) + return; + + modest_msg_edit_window_set_draft (edit_window, saved_draft); +} + void modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edit_window) { @@ -2114,14 +2227,16 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi MsgData *data; gchar *account_name, *from; ModestAccountMgr *account_mgr; - gchar *info_text = NULL; + char *info_text; g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window)); data = modest_msg_edit_window_get_msg_data (edit_window); + account_name = g_strdup (data->account_name); account_mgr = modest_runtime_get_account_mgr(); - account_name = g_strdup(modest_window_get_active_account (MODEST_WINDOW(edit_window))); + if (!account_name) + account_name = g_strdup(modest_window_get_active_account (MODEST_WINDOW(edit_window))); if (!account_name) account_name = modest_account_mgr_get_default_account (account_mgr); if (!account_name) { @@ -2148,13 +2263,12 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi from = modest_account_mgr_get_from_string (account_mgr, account_name); /* Create the mail operation */ - mail_operation = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_INFO, G_OBJECT(edit_window)); + mail_operation = modest_mail_operation_new (G_OBJECT(edit_window)); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_operation); modest_mail_operation_save_to_drafts (mail_operation, transport_account, data->draft_msg, - edit_window, from, data->to, data->cc, @@ -2163,70 +2277,113 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi data->plain_body, data->html_body, data->attachments, - data->priority_flags); + data->images, + data->priority_flags, + on_save_to_drafts_cb, + edit_window); + info_text = g_strdup_printf (_("mail_va_saved_to_drafts"), _("mcen_me_folder_drafts")); + modest_platform_information_banner (NULL, NULL, info_text); + /* Frees */ + g_free (info_text); g_free (from); g_free (account_name); g_object_unref (G_OBJECT (transport_account)); g_object_unref (G_OBJECT (mail_operation)); modest_msg_edit_window_free_msg_data (edit_window, data); - - info_text = g_strdup_printf (_("mail_va_saved_to_drafts"), _("mcen_me_folder_drafts")); - modest_platform_information_banner (NULL, NULL, info_text); - g_free (info_text); + modest_msg_edit_window_reset_modified (edit_window); + + /* ** FIXME ** + * If the drafts folder is selected then make the header view + * insensitive while the message is being saved to drafts + * (it'll be sensitive again in on_save_to_drafts_cb()). This + * is not very clean but it avoids letting the drafts folder + * in an inconsistent state: the user could edit the message + * being saved and undesirable things would happen. + * In the average case the user won't notice anything at + * all. In the worst case (the user is editing a really big + * file from Drafts) the header view will be insensitive + * during the saving process (10 or 20 seconds, depending on + * the message). Anyway this is just a quick workaround: once + * we find a better solution it should be removed + * See NB#65125 (commend #18) for details. + */ + ModestMainWindow *win = MODEST_MAIN_WINDOW(modest_window_mgr_get_main_window( + modest_runtime_get_window_mgr(), FALSE)); + if (win != NULL) { + ModestFolderView *view = MODEST_FOLDER_VIEW(modest_main_window_get_child_widget( + win, MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW)); + if (view != NULL) { + TnyFolder *folder = TNY_FOLDER(modest_folder_view_get_selected(view)); + if (folder) { + if (modest_tny_folder_is_local_folder(folder)) { + TnyFolderType folder_type; + folder_type = modest_tny_folder_get_local_or_mmc_folder_type(folder); + if (folder_type == TNY_FOLDER_TYPE_DRAFTS) { + GtkWidget *hdrview = modest_main_window_get_child_widget( + win, MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); + if (hdrview) gtk_widget_set_sensitive(hdrview, FALSE); + } + } + } + if (folder != NULL) g_object_unref(folder); + } + } } /* For instance, when clicking the Send toolbar button when editing a message: */ void modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) { + TnyTransportAccount *transport_account = NULL; + g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window)); if (!modest_msg_edit_window_check_names (edit_window, TRUE)) return; - /* Offer the connection dialog, if necessary: */ - if (!modest_platform_connect_and_wait (GTK_WINDOW (edit_window), NULL)) - return; - /* FIXME: Code added just for testing. The final version will use the send queue provided by tinymail and some classifier */ + MsgData *data = modest_msg_edit_window_get_msg_data (edit_window); + ModestAccountMgr *account_mgr = modest_runtime_get_account_mgr(); - gchar *account_name = g_strdup(modest_window_get_active_account (MODEST_WINDOW(edit_window))); + gchar *account_name = g_strdup (data->account_name); + if (!account_name) + g_strdup(modest_window_get_active_account (MODEST_WINDOW(edit_window))); + if (!account_name) account_name = modest_account_mgr_get_default_account (account_mgr); if (!account_name) { + modest_msg_edit_window_free_msg_data (edit_window, data); /* Run account setup wizard */ - const gboolean created = modest_run_account_setup_wizard(MODEST_WINDOW(edit_window)); - if (!created) + if (!modest_ui_actions_run_account_setup_wizard (MODEST_WINDOW(edit_window))) return; } - MsgData *data = modest_msg_edit_window_get_msg_data (edit_window); - - if (!strcmp (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) { - account_name = g_strdup (data->account_name); + /* Get the currently-active transport account for this modest account: */ +/* TnyTransportAccount *transport_account = */ +/* TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_transport_account_for_open_connection */ +/* (modest_runtime_get_account_store(), */ +/* account_name)); */ + if (strcmp (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID) != 0) { + transport_account = TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_server_account + (modest_runtime_get_account_store(), + account_name, TNY_ACCOUNT_TYPE_TRANSPORT)); } - /* Get the currently-active transport account for this modest account: */ - TnyTransportAccount *transport_account = - TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_transport_account_for_open_connection - (modest_runtime_get_account_store(), - account_name)); if (!transport_account) { /* Run account setup wizard */ - const gboolean created = modest_run_account_setup_wizard(MODEST_WINDOW(edit_window)); - if (!created) + if (!modest_ui_actions_run_account_setup_wizard(MODEST_WINDOW(edit_window))) return; } gchar *from = modest_account_mgr_get_from_string (account_mgr, account_name); /* Create the mail operation */ - ModestMailOperation *mail_operation = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_SEND, G_OBJECT(edit_window)); + ModestMailOperation *mail_operation = modest_mail_operation_new (G_OBJECT(edit_window)); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_operation); modest_mail_operation_send_new_mail (mail_operation, @@ -2240,6 +2397,7 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) data->plain_body, data->html_body, data->attachments, + data->images, data->priority_flags); /* Free data: */ @@ -2451,16 +2609,13 @@ modest_ui_actions_create_folder(GtkWidget *parent_window, g_free (suggested_name); suggested_name = NULL; - if (result == GTK_RESPONSE_REJECT) { - finished = TRUE; - } else { + if (result == GTK_RESPONSE_ACCEPT) { ModestMailOperation *mail_op; TnyFolder *new_folder = NULL; - mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_INFO, - G_OBJECT(parent_window), + mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(parent_window), modest_ui_actions_new_folder_error_handler, - parent_window); + parent_window, NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); @@ -2475,6 +2630,8 @@ modest_ui_actions_create_folder(GtkWidget *parent_window, finished = TRUE; } g_object_unref (mail_op); + } else { + finished = TRUE; } suggested_name = folder_name; @@ -2518,7 +2675,9 @@ modest_ui_actions_rename_folder_error_handler (ModestMailOperation *mail_op, message = _CS("ckdg_ib_folder_already_exists"); break; default: - g_return_if_reached (); + g_warning ("%s: BUG: unexpected error:[%d]: %s", __FUNCTION__, + error->code, error->message); + return; } modest_platform_information_banner (GTK_WIDGET (window), NULL, message); @@ -2578,10 +2737,9 @@ modest_ui_actions_on_rename_folder (GtkAction *action, GtkTreeSelection *sel = NULL; mail_op = - modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_INFO, - G_OBJECT(main_window), + modest_mail_operation_new_with_error_handling (G_OBJECT(main_window), modest_ui_actions_rename_folder_error_handler, - main_window); + main_window, NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); @@ -2669,10 +2827,9 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) /* Create the mail operation */ mail_op = - modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_DELETE, - G_OBJECT(main_window), + modest_mail_operation_new_with_error_handling (G_OBJECT(main_window), modest_ui_actions_delete_folder_error_handler, - NULL); + NULL, NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); @@ -2739,7 +2896,6 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store, ModestMainWindow *main_window) { g_return_if_fail(server_account_name); - /* printf("DEBUG: %s: server_account_name=%s\n", __FUNCTION__, server_account_name); */ /* Initalize output parameters: */ if (cancel) @@ -2773,11 +2929,12 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store, gtk_window_set_transient_for (GTK_WINDOW(dialog), GTK_WINDOW(main_window)); - gchar *server_name = modest_server_account_get_hostname ( + gchar *server_name = modest_account_mgr_get_server_account_hostname ( modest_runtime_get_account_mgr(), server_account_name); if (!server_name) {/* This happened once, though I don't know why. murrayc. */ g_warning("%s: Could not get server name for server account '%s'", __FUNCTION__, server_account_name); - *cancel = TRUE; + if (cancel) + *cancel = TRUE; return; } @@ -2791,7 +2948,7 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store, server_name = NULL; /* username: */ - gchar *initial_username = modest_server_account_get_username ( + gchar *initial_username = modest_account_mgr_get_server_account_username ( modest_runtime_get_account_mgr(), server_account_name); GtkWidget *entry_username = gtk_entry_new (); @@ -2800,7 +2957,7 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store, /* Dim this if a connection has ever succeeded with this username, * as per the UI spec: */ const gboolean username_known = - modest_server_account_get_username_has_succeeded( + modest_account_mgr_get_server_account_username_has_succeeded( modest_runtime_get_account_mgr(), server_account_name); gtk_widget_set_sensitive (entry_username, !username_known); @@ -2845,6 +3002,9 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store, gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), entry_password, TRUE, FALSE, 0); #endif /* MODEST_PLATFORM_MAEMO */ + + if (initial_username != NULL) + gtk_widget_grab_focus (GTK_WIDGET (entry_password)); /* This is not in the Maemo UI spec: remember_pass_check = gtk_check_button_new_with_label (_("Remember password")); @@ -2858,7 +3018,7 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store, if (username) { *username = g_strdup (gtk_entry_get_text (GTK_ENTRY(entry_username))); - modest_server_account_set_username ( + modest_account_mgr_set_server_account_username ( modest_runtime_get_account_mgr(), server_account_name, *username); @@ -2938,10 +3098,11 @@ modest_ui_actions_on_cut (GtkAction *action, num_of_unc_msgs = header_list_count_uncached_msgs(header_list); - if (num_of_unc_msgs) - continue_download = connect_to_get_msg( - GTK_WINDOW (window), - num_of_unc_msgs); + if (num_of_unc_msgs) { + TnyAccount *account = get_account_from_header_list (header_list); + continue_download = connect_to_get_msg (window, num_of_unc_msgs, account); + g_object_unref (account); + } if (num_of_unc_msgs == 0 || continue_download) { /* modest_platform_information_banner ( @@ -2993,10 +3154,11 @@ modest_ui_actions_on_copy (GtkAction *action, num_of_unc_msgs = header_list_count_uncached_msgs(header_list); - if (num_of_unc_msgs) - continue_download = connect_to_get_msg( - GTK_WINDOW (window), - num_of_unc_msgs); + if (num_of_unc_msgs) { + TnyAccount *account = get_account_from_header_list (header_list); + continue_download = connect_to_get_msg (window, num_of_unc_msgs, account); + g_object_unref (account); + } if (num_of_unc_msgs == 0 || continue_download) { modest_platform_information_banner ( @@ -3114,8 +3276,7 @@ modest_ui_actions_on_paste (GtkAction *action, helper->banner = modest_platform_animation_banner (GTK_WIDGET (window), NULL, _CS("ckct_nw_pasting")); modest_email_clipboard_get_data (e_clipboard, &src_folder, &data, &delete); - mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, - G_OBJECT (window)); + mail_op = modest_mail_operation_new (G_OBJECT (window)); if (helper->banner != NULL) { g_object_ref (G_OBJECT (helper->banner)); gtk_window_set_modal (GTK_WINDOW (helper->banner), FALSE); @@ -3146,7 +3307,7 @@ modest_ui_actions_on_paste (GtkAction *action, modest_email_clipboard_get_data (clipboard, &src_folder, &data, &delete); /* Create a new mail operation */ - mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(window)); + mail_op = modest_mail_operation_new (G_OBJECT(window)); /* Get destination folder */ folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (focused_widget)); @@ -3157,7 +3318,7 @@ modest_ui_actions_on_paste (GtkAction *action, /* Ask for user confirmation */ response = - modest_ui_actions_msgs_move_to_confirmation (GTK_WINDOW (window), + modest_ui_actions_msgs_move_to_confirmation (window, TNY_FOLDER (folder_store), delete, data); @@ -3543,16 +3704,13 @@ modest_ui_actions_on_folder_display_name_changed (ModestFolderView *folder_view, const gchar *display_name, GtkWindow *window) { - /* Do not change the application name if the widget has not - the focus. This callback could be called even if the folder - view has not the focus, because the handled signal could be - emitted when the folder view is redrawn */ - if (gtk_widget_is_focus (GTK_WIDGET (folder_view))) { - if (display_name) - gtk_window_set_title (window, display_name); - else - gtk_window_set_title (window, " "); - } + /* This is usually used to change the title of the main window, which + * is the one that holds the folder view. Note that this change can + * happen even when the widget doesn't have the focus. */ + if (display_name) + gtk_window_set_title (window, display_name); + else + gtk_window_set_title (window, " "); } void @@ -3615,12 +3773,15 @@ on_move_to_dialog_folder_selection_changed (ModestFolderView* self, /* check if folder_store is an remote account */ if (TNY_IS_ACCOUNT (folder_store)) { TnyAccount *local_account = NULL; + TnyAccount *mmc_account = NULL; ModestTnyAccountStore *account_store = NULL; account_store = modest_runtime_get_account_store (); local_account = modest_tny_account_store_get_local_folders_account (account_store); + mmc_account = modest_tny_account_store_get_mmc_folders_account (account_store); - if ((gpointer) local_account != (gpointer) folder_store) { + if ((gpointer) local_account != (gpointer) folder_store && + (gpointer) mmc_account != (gpointer) folder_store) { is_local_account = FALSE; /* New button should be dimmed on remote account root */ @@ -3753,6 +3914,8 @@ create_move_to_dialog (GtkWindow *win, if (MODEST_IS_FOLDER_VIEW (folder_view)) { const gchar *visible_id = NULL; + modest_folder_view_set_style (MODEST_FOLDER_VIEW (*tree_view), + MODEST_FOLDER_VIEW_STYLE_SHOW_ALL); modest_folder_view_copy_model (MODEST_FOLDER_VIEW(folder_view), MODEST_FOLDER_VIEW(*tree_view)); @@ -3767,6 +3930,8 @@ create_move_to_dialog (GtkWindow *win, ModestAccountMgr *mgr = NULL; ModestAccountData *acc_data = NULL; + 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 ())); @@ -3844,21 +4009,21 @@ has_retrieved_msgs (TnyList *list) * drag_and_drop_from_header_view (for d&d in modest_folder_view.c) */ gint -modest_ui_actions_msgs_move_to_confirmation (GtkWindow *win, +modest_ui_actions_msgs_move_to_confirmation (ModestWindow *win, TnyFolder *dest_folder, gboolean delete, TnyList *headers) { gint response = GTK_RESPONSE_OK; + TnyAccount *account = NULL; + TnyFolder *src_folder = NULL; + TnyIterator *iter = NULL; + TnyHeader *header = NULL; /* return with OK if the destination is a remote folder */ if (modest_tny_folder_is_remote_folder (dest_folder)) return GTK_RESPONSE_OK; - TnyFolder *src_folder = NULL; - TnyIterator *iter = NULL; - TnyHeader *header = NULL; - /* Get source folder */ iter = tny_list_create_iterator (headers); header = TNY_HEADER (tny_iterator_get_current (iter)); @@ -3877,15 +4042,20 @@ modest_ui_actions_msgs_move_to_confirmation (GtkWindow *win, g_object_unref (src_folder); return GTK_RESPONSE_OK; } - g_object_unref (src_folder); + + /* Get the account */ + account = tny_folder_get_account (src_folder); /* now if offline we ask the user */ - if(connect_to_get_msg( GTK_WINDOW (win), - tny_list_get_length (headers))) + if(connect_to_get_msg (win, tny_list_get_length (headers), account)) response = GTK_RESPONSE_OK; else response = GTK_RESPONSE_CANCEL; + /* Frees */ + g_object_unref (src_folder); + g_object_unref (account); + return response; } @@ -3894,6 +4064,8 @@ modest_ui_actions_msgs_move_to_confirmation (GtkWindow *win, static void move_to_cb (ModestMailOperation *mail_op, gpointer user_data) { + MoveToHelper *helper = (MoveToHelper *) user_data; + /* Note that the operation could have failed, in that case do nothing */ if (modest_mail_operation_get_status (mail_op) == @@ -3907,12 +4079,26 @@ move_to_cb (ModestMailOperation *mail_op, gpointer user_data) if (!modest_msg_view_window_select_previous_message (self)) /* No more messages to view, so close this window */ modest_ui_actions_on_close_window (NULL, MODEST_WINDOW(self)); + } else if (MODEST_IS_MAIN_WINDOW (object) && helper->reference != NULL) { + GtkWidget *header_view; + GtkTreePath *path; + GtkTreeSelection *sel; + + header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(object), + MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (header_view)); + path = gtk_tree_row_reference_get_path (helper->reference); + gtk_tree_selection_select_path (sel, path); + gtk_tree_path_free (path); } g_object_unref (object); } /* Close the "Pasting" information banner */ - gtk_widget_destroy (GTK_WIDGET(user_data)); + gtk_widget_destroy (GTK_WIDGET(helper->banner)); + if (helper->reference != NULL) + gtk_tree_row_reference_free (helper->reference); + g_free (helper); } void @@ -3920,8 +4106,7 @@ modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op, gpointer user_data) { ModestWindow *main_window = NULL; - GtkWidget *folder_view = NULL; - GObject *win = modest_mail_operation_get_source (mail_op); + GObject *win = NULL; const GError *error = NULL; const gchar *message = NULL; @@ -3934,19 +4119,26 @@ modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op, } /* Disable next automatic folder selection */ - main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()); - folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (main_window), - MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); - modest_folder_view_disable_next_folder_selection (MODEST_FOLDER_VIEW(folder_view)); + main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), + FALSE); /* don't create */ + if (main_window) { + GtkWidget *folder_view = NULL; - if (user_data && TNY_IS_FOLDER (user_data)) { - modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view), - TNY_FOLDER (user_data), FALSE); + folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (main_window), + MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); + modest_folder_view_disable_next_folder_selection (MODEST_FOLDER_VIEW(folder_view)); + + if (user_data && TNY_IS_FOLDER (user_data)) { + modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view), + TNY_FOLDER (user_data), FALSE); + } } /* Show notification dialog */ - modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL, message); - g_object_unref (win); + win = modest_mail_operation_get_source (mail_op); + modest_platform_run_information_dialog ((GtkWindow *) win, message); + if (win) + g_object_unref (win); } void @@ -3975,7 +4167,9 @@ modest_ui_actions_send_receive_error_handler (ModestMailOperation *mail_op, static void open_msg_for_purge_cb (ModestMailOperation *mail_op, TnyHeader *header, + gboolean canceled, TnyMsg *msg, + GError *err, gpointer user_data) { TnyList *parts; @@ -4038,8 +4232,9 @@ open_msg_for_purge_cb (ModestMailOperation *mail_op, tny_msg_rewrite_cache (msg); } - } else { - modest_platform_information_banner (NULL, NULL, _("mail_ib_attachment_already_purged")); + /* } else { */ + /* This string no longer exists, refer to NB#75415 for more info */ + /* modest_platform_information_banner (NULL, NULL, _("mail_ib_attachment_already_purged")); */ } g_object_unref (iter); @@ -4066,15 +4261,23 @@ modest_ui_actions_on_main_window_remove_attachments (GtkAction *action, MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); header_list = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (header_view)); - + if (!header_list) { + g_warning ("%s: no header selected", __FUNCTION__); + return; + } + if (tny_list_get_length (header_list) == 1) { iter = tny_list_create_iterator (header_list); header = TNY_HEADER (tny_iterator_get_current (iter)); g_object_unref (iter); - } else { + } else + return; + + if (!header || !TNY_IS_HEADER(header)) { + g_warning ("%s: header is not valid", __FUNCTION__); return; } - + found = modest_window_mgr_find_registered_header (modest_runtime_get_window_mgr (), header, &msg_view_window); flags = tny_header_get_flags (header); @@ -4089,11 +4292,10 @@ modest_ui_actions_on_main_window_remove_attachments (GtkAction *action, } } else { ModestMailOperation *mail_op = NULL; - modest_window_mgr_register_header (modest_runtime_get_window_mgr (), header); - mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, - G_OBJECT (win), + modest_window_mgr_register_header (modest_runtime_get_window_mgr (), header, NULL); + mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT (win), modest_ui_actions_get_msgs_full_error_handler, - NULL); + NULL, NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); modest_mail_operation_get_msg (mail_op, header, open_msg_for_purge_cb, win); @@ -4137,6 +4339,11 @@ modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder, /* Get selected headers */ headers = get_selected_headers (MODEST_WINDOW (win)); + if (!headers) { + g_warning ("%s: no headers selected", __FUNCTION__); + return; + } + if (dst_is_pop) { modest_platform_information_banner (GTK_WIDGET (win), @@ -4148,19 +4355,25 @@ modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder, return; } - GtkWidget *inf_note; - inf_note = modest_platform_animation_banner (GTK_WIDGET (win), NULL, - _CS("ckct_nw_pasting")); - if (inf_note != NULL) { - gtk_window_set_modal (GTK_WINDOW(inf_note), FALSE); - gtk_widget_show (GTK_WIDGET(inf_note)); + MoveToHelper *helper = g_new0 (MoveToHelper, 1); + helper->banner = modest_platform_animation_banner (GTK_WIDGET (win), NULL, + _CS("ckct_nw_pasting")); + if (helper->banner != NULL) { + gtk_window_set_modal (GTK_WINDOW(helper->banner), FALSE); + gtk_widget_show (GTK_WIDGET(helper->banner)); + } + + if (MODEST_IS_MAIN_WINDOW (win)) { + GtkWidget *header_view = + modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win), + MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); + helper->reference = get_next_after_selected_headers (MODEST_HEADER_VIEW (header_view)); } ModestMailOperation *mail_op = - modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, - G_OBJECT(win), + modest_mail_operation_new_with_error_handling (G_OBJECT(win), modest_ui_actions_move_folder_error_handler, - NULL); + NULL, NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); @@ -4169,7 +4382,7 @@ modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder, TNY_FOLDER (dst_folder), TRUE, move_to_cb, - inf_note); + helper); g_object_unref (G_OBJECT (mail_op)); g_object_unref (headers); @@ -4211,29 +4424,38 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action, g_warning ("%s: src_folder is not a TnyFolder.\n", __FUNCTION__); do_xfer = FALSE; } else if (!online && modest_platform_is_network_folderstore(src_folder)) { - guint num_headers = tny_folder_get_all_count(TNY_FOLDER(src_folder)); - if (!connect_to_get_msg(GTK_WINDOW(win), num_headers)) { + guint num_headers = tny_folder_get_all_count(TNY_FOLDER (src_folder)); + TnyAccount *account = tny_folder_get_account (TNY_FOLDER (src_folder)); + if (!connect_to_get_msg(MODEST_WINDOW (win), num_headers, account)) do_xfer = FALSE; - } + g_object_unref (account); } if (do_xfer) { - GtkWidget *inf_note; - inf_note = modest_platform_animation_banner (GTK_WIDGET (win), NULL, - _CS("ckct_nw_pasting")); - if (inf_note != NULL) { - gtk_window_set_modal (GTK_WINDOW(inf_note), FALSE); - gtk_widget_show (GTK_WIDGET(inf_note)); + MoveToHelper *helper = g_new0 (MoveToHelper, 1); + helper->banner = modest_platform_animation_banner (GTK_WIDGET (win), NULL, + _CS("ckct_nw_pasting")); + if (helper->banner != NULL) { + gtk_window_set_modal (GTK_WINDOW(helper->banner), FALSE); + gtk_widget_show (GTK_WIDGET(helper->banner)); } /* Clean folder on header view before moving it */ sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_view)); gtk_tree_selection_unselect_all (sel); + /* Let gtk events run. We need that the folder + view frees its reference to the source + folder *before* issuing the mail operation + so we need the signal handler of selection + changed to happen before the mail + operation */ + while (gtk_events_pending ()) + gtk_main_iteration (); + mail_op = - modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, - G_OBJECT(win), + modest_mail_operation_new_with_error_handling (G_OBJECT(win), modest_ui_actions_move_folder_error_handler, - src_folder); + src_folder, NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); @@ -4247,7 +4469,7 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action, dst_folder, TRUE, move_to_cb, - inf_note); + helper); /* Unref mail operation */ g_object_unref (G_OBJECT (mail_op)); } @@ -4258,9 +4480,10 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action, TnyList *headers = modest_header_view_get_selected_headers(header_view); if (!msgs_already_deleted_from_server(headers, src_folder)) { guint num_headers = tny_list_get_length(headers); - if (!connect_to_get_msg(GTK_WINDOW(win), num_headers)) { + TnyAccount *account = get_account_from_header_list (headers); + if (!connect_to_get_msg(MODEST_WINDOW (win), num_headers, account)) do_xfer = FALSE; - } + g_object_unref (account); } g_object_unref(headers); } @@ -4283,19 +4506,32 @@ modest_ui_actions_on_msg_view_window_move_to (GtkAction *action, ModestMsgViewWindow *win) { TnyHeader *header = NULL; - TnyFolderStore *src_folder; + 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_STORE(tny_header_get_folder(header)); + src_folder = TNY_FOLDER (tny_header_get_folder(header)); g_object_unref (header); - /* Transfer the message if online or confirmed by the user */ - if (tny_device_is_online (modest_runtime_get_device()) || remote_folder_is_pop(src_folder) || - (modest_platform_is_network_folderstore(src_folder) && connect_to_get_msg(GTK_WINDOW(win), 1))) { + account = tny_folder_get_account (src_folder); + 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); g_object_unref (src_folder); } @@ -4316,7 +4552,8 @@ modest_ui_actions_on_move_to (GtkAction *action, main_window = MODEST_MAIN_WINDOW (win); else main_window = - MODEST_MAIN_WINDOW (modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ())); + MODEST_MAIN_WINDOW (modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), + FALSE)); /* don't create */ /* Get the folder view widget if exists */ if (main_window) @@ -4454,78 +4691,83 @@ modest_ui_actions_on_settings (GtkAction *action, void modest_ui_actions_on_help (GtkAction *action, - ModestWindow *win) + GtkWindow *win) { - const gchar *help_id = NULL; + const gchar *help_id; - if (MODEST_IS_MAIN_WINDOW (win)) { - GtkWidget *folder_view; - TnyFolderStore *folder_store; - - /* Get selected folder */ - folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); - folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); - - /* Switch help_id */ - if (TNY_IS_FOLDER (folder_store)) { - switch (modest_tny_folder_guess_folder_type (TNY_FOLDER (folder_store))) { - case TNY_FOLDER_TYPE_NORMAL: - help_id = "applications_email_managefolders"; - break; - case TNY_FOLDER_TYPE_INBOX: - help_id = "applications_email_inbox"; - break; - case TNY_FOLDER_TYPE_OUTBOX: - help_id = "applications_email_outbox"; - break; - case TNY_FOLDER_TYPE_SENT: - help_id = "applications_email_sent"; - break; - case TNY_FOLDER_TYPE_DRAFTS: - help_id = "applications_email_drafts"; - break; - case TNY_FOLDER_TYPE_ARCHIVE: - help_id = "applications_email_managefolders"; - break; - default: - help_id = "applications_email_managefolders"; - } - } else { - help_id = "applications_email_mainview"; - } - g_object_unref (folder_store); - } else if (MODEST_IS_MSG_VIEW_WINDOW (win)) { - help_id = "applications_email_viewer"; - } else if (MODEST_IS_MSG_EDIT_WINDOW (win)) - help_id = "applications_email_editor"; + g_return_if_fail (action); + g_return_if_fail (win && GTK_IS_WINDOW(win)); + + help_id = modest_window_mgr_get_help_id (modest_runtime_get_window_mgr(), win); + + if (help_id) + modest_platform_show_help (GTK_WINDOW (win), help_id); + else + g_warning ("%s: no help for window %p", __FUNCTION__, win); +} + +static void +retrieve_msg_contents_performer (gboolean canceled, + GError *err, + GtkWindow *parent_window, + TnyAccount *account, + gpointer user_data) +{ + ModestMailOperation *mail_op; + TnyList *headers = TNY_LIST (user_data); + + if (err || canceled) { + /* Show an error ? */ + goto out; + } + + /* Create mail operation */ + mail_op = modest_mail_operation_new_with_error_handling ((GObject *) parent_window, + modest_ui_actions_get_msgs_full_error_handler, + NULL, NULL); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); + modest_mail_operation_get_msgs_full (mail_op, headers, NULL, NULL, NULL); - modest_platform_show_help (GTK_WINDOW (win), help_id); + /* Frees */ + g_object_unref (mail_op); + out: + g_object_unref (headers); + g_object_unref (account); } void modest_ui_actions_on_retrieve_msg_contents (GtkAction *action, ModestWindow *window) { - ModestMailOperation *mail_op; - TnyList *headers; + TnyList *headers = NULL; + TnyAccount *account = NULL; + TnyIterator *iter = NULL; + TnyHeader *header = NULL; + TnyFolder *folder = NULL; /* Get headers */ headers = get_selected_headers (window); if (!headers) return; - /* Create mail operation */ - mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, - G_OBJECT (window), - modest_ui_actions_get_msgs_full_error_handler, - NULL); - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); - modest_mail_operation_get_msgs_full (mail_op, headers, NULL, NULL, NULL); + /* Pick the account */ + iter = tny_list_create_iterator (headers); + header = TNY_HEADER (tny_iterator_get_current (iter)); + folder = tny_header_get_folder (header); + account = tny_folder_get_account (folder); + g_object_unref (folder); + g_object_unref (header); + g_object_unref (iter); + + /* Connect and perform the message retrieval */ + modest_platform_connect_and_perform ((GtkWindow *) window, + g_object_ref (account), + retrieve_msg_contents_performer, + g_object_ref (headers)); /* Frees */ + g_object_unref (account); g_object_unref (headers); - g_object_unref (mail_op); } void @@ -4653,16 +4895,54 @@ modest_ui_actions_on_toggle_find_in_page (GtkToggleAction *action, } static void -_on_send_receive_progress_changed (ModestMailOperation *mail_op, - ModestMailOperationState *state, - gpointer user_data) +on_send_receive_finished (ModestMailOperation *mail_op, + gpointer user_data) { - g_return_if_fail (MODEST_IS_MAIN_WINDOW(user_data)); + GtkWidget *header_view, *folder_view; + TnyFolderStore *folder_store; + ModestMainWindow *main_win = MODEST_MAIN_WINDOW (user_data); /* Set send/receive operation finished */ - if (state->status != MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS) - modest_main_window_notify_send_receive_completed (MODEST_MAIN_WINDOW(user_data)); + modest_main_window_notify_send_receive_completed (main_win); + + /* Don't refresh the current folder if there were any errors */ + if (modest_mail_operation_get_status (mail_op) != + MODEST_MAIL_OPERATION_STATUS_SUCCESS) + return; + + /* Refresh the current folder if we're viewing a window. We do + this because the user won't be able to see the new mails in + the selected folder after a Send&Receive because it only + performs a poke_status, i.e, only the number of read/unread + messages is updated, but the new headers are not + downloaded */ + folder_view = modest_main_window_get_child_widget (main_win, + MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); + if (!folder_view) + return; + + folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); + + /* Do not need to refresh INBOX again because the + update_account does it always automatically */ + if (folder_store && TNY_IS_FOLDER (folder_store) && + tny_folder_get_folder_type (TNY_FOLDER (folder_store)) != TNY_FOLDER_TYPE_INBOX) { + + header_view = modest_main_window_get_child_widget (main_win, + MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); + + /* We do not need to set the contents style + because it hasn't changed. We also do not + need to save the widget status. Just force + a refresh */ + modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view), + TNY_FOLDER (folder_store), + folder_refreshed_cb, + main_win); + } + if (folder_store) + g_object_unref (folder_store); } @@ -4732,8 +5012,8 @@ modest_ui_actions_on_send_queue_status_changed (ModestTnySendQueue *send_queue, TnyFolderType folder_type; mgr = modest_runtime_get_window_mgr (); - main_window = MODEST_MAIN_WINDOW (modest_window_mgr_get_main_window (mgr)); - + main_window = MODEST_MAIN_WINDOW (modest_window_mgr_get_main_window (mgr, + FALSE));/* don't create */ if (!main_window) return; @@ -4766,3 +5046,37 @@ modest_ui_actions_on_send_queue_status_changed (ModestTnySendQueue *send_queue, if (selected_folder != NULL) g_object_unref (selected_folder); } + +void +modest_ui_actions_on_account_connection_error (GtkWindow *parent_window, + TnyAccount *account) +{ + ModestTransportStoreProtocol proto; + const gchar *proto_name; + gchar *error_note = NULL; + + proto_name = tny_account_get_proto (account); + proto = modest_protocol_info_get_transport_store_protocol (proto_name); + + switch (proto) { + case MODEST_PROTOCOL_STORE_POP: + error_note = g_strdup_printf (_("emev_ni_ui_pop3_msg_connect_error"), + tny_account_get_hostname (account)); + break; + case MODEST_PROTOCOL_STORE_IMAP: + error_note = g_strdup_printf (_("emev_ni_ui_imap_connect_server_error"), + tny_account_get_hostname (account)); + break; + case MODEST_PROTOCOL_STORE_MAILDIR: + case MODEST_PROTOCOL_STORE_MBOX: + error_note = g_strdup (_("emev_nc_mailbox_notavailable")); + break; + default: + g_warning ("%s: This should not be reached", __FUNCTION__); + } + + if (error_note) { + modest_platform_run_information_dialog (parent_window, error_note); + g_free (error_note); + } +}