X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=d7d3d7a0c00756cd6a9bead6827d0773f7a53ceb;hp=5355be519ff23c517668e0c5df8b9022a6b2964d;hb=10135c887c0c30ddefa85716b06d3e5795a17651;hpb=201c850b03ab4d1ffd973ad4682c460e06a53a6d diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index 5355be5..d7d3d7a 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -70,7 +70,7 @@ #include "modest-text-utils.h" #ifdef MODEST_HAVE_EASYSETUP -#include "easysetup/modest-easysetup-wizard.h" +#include "easysetup/modest-easysetup-wizard-dialog.h" #endif /* MODEST_HAVE_EASYSETUP */ #include @@ -154,10 +154,7 @@ static gboolean connect_to_get_msg (ModestWindow *win, gint num_of_uncached_msgs, TnyAccount *account); -static gboolean remote_folder_is_pop (const TnyFolderStore *folder); - -static gboolean msgs_already_deleted_from_server ( TnyList *headers, - const TnyFolderStore *src_folder); +static gboolean remote_folder_is_pop (TnyFolderStore *folder); static void do_create_folder (GtkWindow *window, TnyFolderStore *parent_folder, @@ -165,55 +162,31 @@ static void do_create_folder (GtkWindow *window, static GtkWidget* get_folder_view_from_move_to_dialog (GtkWidget *move_to_dialog); +static TnyAccount *get_account_from_folder_store (TnyFolderStore *folder_store); + +static void transfer_messages_helper (GtkWindow *win, + TnyFolder *src_folder, + TnyList *headers, + TnyFolder *dst_folder); /* * This function checks whether a TnyFolderStore is a pop account */ static gboolean -remote_folder_is_pop (const TnyFolderStore *folder) +remote_folder_is_pop (TnyFolderStore *folder) { const gchar *proto = NULL; TnyAccount *account = NULL; - g_return_val_if_fail (TNY_IS_FOLDER_STORE(folder), FALSE); - - if (TNY_IS_ACCOUNT (folder)) { - account = TNY_ACCOUNT(folder); - g_object_ref(account); - } else if (TNY_IS_FOLDER (folder)) { - account = tny_folder_get_account(TNY_FOLDER(folder)); - } - - if (!TNY_IS_ACCOUNT(account)) { - g_warning ("%s: could not get account", __FUNCTION__); - return FALSE; - } + g_return_val_if_fail (TNY_IS_FOLDER_STORE (folder), FALSE); - proto = tny_account_get_proto(account); + account = get_account_from_folder_store (folder); + proto = tny_account_get_proto (account); g_object_unref (account); - return proto && - (modest_protocol_info_get_transport_store_protocol (proto) == MODEST_PROTOCOL_STORE_POP); + return (modest_protocol_info_get_transport_store_protocol (proto) == MODEST_PROTOCOL_STORE_POP); } -/* - * This functions checks whether if a list of messages are already - * deleted from the server: that is, if the server is a POP account - * and all messages are already cached. - */ -static gboolean -msgs_already_deleted_from_server (TnyList *headers, const TnyFolderStore *src_folder) -{ - g_return_val_if_fail (TNY_IS_FOLDER_STORE(src_folder), FALSE); - g_return_val_if_fail (TNY_IS_LIST(headers), FALSE); - - gboolean src_is_pop = remote_folder_is_pop (src_folder); - gint uncached_msgs = header_list_count_uncached_msgs (headers); - - return (src_is_pop && !uncached_msgs); -} - - /* FIXME: this should be merged with the similar code in modest-account-view-window */ /* Show the account creation wizard dialog. * returns: TRUE if an account was created. FALSE if the user cancelled. @@ -395,11 +368,8 @@ void modest_ui_actions_refresh_message_window_after_delete (ModestMsgViewWindow* win) { /* Close msg view window or select next */ - if (modest_msg_view_window_last_message_selected (win) && - modest_msg_view_window_first_message_selected (win)) { - modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (win)); - } else if (!modest_msg_view_window_select_next_message (win) && - !modest_msg_view_window_select_previous_message (win)) { + if (!modest_msg_view_window_select_next_message (win) && + !modest_msg_view_window_select_previous_message (win)) { gboolean ret_value; g_signal_emit_by_name (G_OBJECT (win), "delete-event", NULL, &ret_value); } @@ -733,7 +703,8 @@ modest_ui_actions_compose_msg(ModestWindow *win, const gchar *bcc_str, const gchar *subject_str, const gchar *body_str, - GSList *attachments) + GSList *attachments, + gboolean set_as_modified) { gchar *account_name = NULL; TnyMsg *msg = NULL; @@ -788,6 +759,8 @@ modest_ui_actions_compose_msg(ModestWindow *win, attachments = g_slist_next(attachments); } modest_window_mgr_register_window (modest_runtime_get_window_mgr(), msg_win); + modest_msg_edit_window_set_modified (MODEST_MSG_EDIT_WINDOW (msg_win), set_as_modified); + gtk_widget_show_all (GTK_WIDGET (msg_win)); cleanup: @@ -809,7 +782,7 @@ modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win) if (!modest_ui_actions_run_account_setup_wizard (win)) return; - modest_ui_actions_compose_msg(win, NULL, NULL, NULL, NULL, NULL, NULL); + modest_ui_actions_compose_msg(win, NULL, NULL, NULL, NULL, NULL, NULL, FALSE); } @@ -834,6 +807,35 @@ modest_ui_actions_msg_retrieval_check (ModestMailOperation *mail_op, return TRUE; } +typedef struct { + guint idle_handler; + gchar *message; + GtkWidget *banner; +} OpenMsgBannerInfo; + +typedef struct { + GtkTreeModel *model; + TnyList *headers; + OpenMsgBannerInfo *banner_info; + GHashTable *row_refs_per_header; +} OpenMsgHelper; + +gboolean +open_msg_banner_idle (gpointer userdata) +{ + OpenMsgBannerInfo *banner_info = (OpenMsgBannerInfo *) userdata; + + gdk_threads_enter (); + banner_info->idle_handler = 0; + banner_info->banner = modest_platform_animation_banner (NULL, NULL, banner_info->message); + g_object_ref (banner_info->banner); + + gdk_threads_leave (); + + return FALSE; + +} + static void open_msg_cb (ModestMailOperation *mail_op, TnyHeader *header, @@ -849,6 +851,7 @@ open_msg_cb (ModestMailOperation *mail_op, gchar *account = NULL; TnyFolder *folder; gboolean open_in_editor = FALSE; + OpenMsgHelper *helper = (OpenMsgHelper *) user_data; /* Do nothing if there was any problem with the mail operation. The error will be shown by the error_handler of @@ -935,39 +938,17 @@ open_msg_cb (ModestMailOperation *mail_op, win = modest_msg_edit_window_new (msg, account, TRUE); - /* Show banner */ - modest_platform_information_banner_with_timeout - (NULL, NULL, _("mail_ib_opening_draft_message"), 1200); } else { gchar *uid = modest_tny_folder_get_header_unique_id (header); if (MODEST_IS_MAIN_WINDOW (parent_win)) { - GtkWidget *header_view; - GtkTreeSelection *sel; - GList *sel_list = NULL; - GtkTreeModel *model; - - header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(parent_win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); + GtkTreeRowReference *row_reference; - sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (header_view)); - sel_list = gtk_tree_selection_get_selected_rows (sel, &model); - - if (sel_list != NULL) { - GtkTreeRowReference *row_reference; - - row_reference = gtk_tree_row_reference_new (model, (GtkTreePath *) sel_list->data); - g_list_foreach (sel_list, (GFunc) gtk_tree_path_free, NULL); - g_list_free (sel_list); + row_reference = (GtkTreeRowReference *) g_hash_table_lookup (helper->row_refs_per_header, header); - win = modest_msg_view_window_new_with_header_model ( - msg, account, (const gchar*) uid, - model, row_reference); - gtk_tree_row_reference_free (row_reference); - } else { - win = modest_msg_view_window_new_for_attachment (msg, account, (const gchar*) uid); - } + win = modest_msg_view_window_new_with_header_model (msg, account, (const gchar*) uid, + helper->model, row_reference); } else { win = modest_msg_view_window_new_for_attachment (msg, account, (const gchar*) uid); } @@ -995,8 +976,8 @@ cleanup: } void -modest_ui_actions_get_msgs_full_error_handler (ModestMailOperation *mail_op, - gpointer user_data) +modest_ui_actions_disk_operations_error_handler (ModestMailOperation *mail_op, + gpointer user_data) { const GError *error; GObject *win = NULL; @@ -1008,9 +989,16 @@ modest_ui_actions_get_msgs_full_error_handler (ModestMailOperation *mail_op, if (error->code == TNY_SYSTEM_ERROR_MEMORY || error->code == TNY_IO_ERROR_WRITE || error->code == TNY_IO_ERROR_READ) { + ModestMailOperationStatus st = modest_mail_operation_get_status (mail_op); + /* If the mail op has been cancelled then it's not an error: don't show any message */ + if (st != MODEST_MAIL_OPERATION_STATUS_CANCELED) { + modest_platform_information_banner ((GtkWidget *) win, + NULL, dgettext("ke-recv", + "cerm_device_memory_full")); + } + } else if (user_data) { modest_platform_information_banner ((GtkWidget *) win, - NULL, dgettext("ke-recv", - "cerm_device_memory_full")); + NULL, user_data); } if (win) @@ -1030,9 +1018,29 @@ get_account_from_header_list (TnyList *headers) 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); + + if (!folder) { + g_object_unref (header); + + while (!tny_iterator_is_done (iter)) { + header = TNY_HEADER (tny_iterator_get_current (iter)); + folder = tny_header_get_folder (header); + if (folder) + break; + g_object_unref (header); + header = NULL; + tny_iterator_next (iter); + } + } + + if (folder) { + account = tny_folder_get_account (folder); + g_object_unref (folder); + } + + if (header) + g_object_unref (header); + g_object_unref (iter); } return account; @@ -1049,6 +1057,31 @@ foreach_unregister_headers (gpointer data, } static void +open_msgs_helper_destroyer (gpointer user_data) +{ + OpenMsgHelper *helper = (OpenMsgHelper *) user_data; + + if (helper->banner_info) { + g_free (helper->banner_info->message); + if (helper->banner_info->idle_handler > 0) { + g_source_remove (helper->banner_info->idle_handler); + helper->banner_info->idle_handler = 0; + } + if (helper->banner_info->banner != NULL) { + gtk_widget_destroy (helper->banner_info->banner); + g_object_unref (helper->banner_info->banner); + helper->banner_info->banner = NULL; + } + g_slice_free (OpenMsgBannerInfo, helper->banner_info); + helper->banner_info = NULL; + } + g_object_unref (helper->model); + g_object_unref (helper->headers); + g_hash_table_destroy (helper->row_refs_per_header); + g_slice_free (OpenMsgHelper, helper); +} + +static void open_msgs_performer(gboolean canceled, GError *err, GtkWindow *parent_window, @@ -1061,14 +1094,19 @@ open_msgs_performer(gboolean canceled, ModestTransportStoreProtocol proto; TnyList *not_opened_headers; TnyConnectionStatus status; + gboolean show_open_draft = FALSE; + OpenMsgHelper *helper = NULL; - not_opened_headers = TNY_LIST (user_data); + helper = (OpenMsgHelper *) user_data; + not_opened_headers = helper->headers; status = tny_account_get_connection_status (account); if (err || canceled) { /* Unregister the already registered headers */ tny_list_foreach (not_opened_headers, foreach_unregister_headers, modest_runtime_get_window_mgr ()); + /* Free the helper */ + open_msgs_helper_destroyer (helper); goto clean; } @@ -1092,6 +1130,19 @@ open_msgs_performer(gboolean canceled, g_object_unref (header); g_object_unref (iter); } else { + TnyHeader *header; + TnyFolder *folder; + TnyIterator *iter; + TnyFolderType folder_type; + + iter = tny_list_create_iterator (not_opened_headers); + header = TNY_HEADER (tny_iterator_get_current (iter)); + folder = tny_header_get_folder (header); + folder_type = modest_tny_folder_get_local_or_mmc_folder_type (folder); + show_open_draft = (folder_type == TNY_FOLDER_TYPE_DRAFTS); + g_object_unref (folder); + g_object_unref (header); + g_object_unref (iter); error_msg = g_strdup (_("mail_ni_ui_folder_get_msg_folder_error")); } } else { @@ -1101,22 +1152,29 @@ open_msgs_performer(gboolean canceled, /* Create the mail operation */ mail_op = modest_mail_operation_new_with_error_handling ((GObject *) parent_window, - modest_ui_actions_get_msgs_full_error_handler, + modest_ui_actions_disk_operations_error_handler, error_msg, g_free); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); - + + if (show_open_draft) { + helper->banner_info = g_slice_new (OpenMsgBannerInfo); + helper->banner_info->message = g_strdup (_("mail_ib_opening_draft_message")); + helper->banner_info->banner = NULL; + helper->banner_info->idle_handler = g_timeout_add (500, open_msg_banner_idle, + helper->banner_info); + } + modest_mail_operation_get_msgs_full (mail_op, not_opened_headers, open_msg_cb, - NULL, - NULL); + helper, + open_msgs_helper_destroyer); /* Frees */ clean: if (mail_op) g_object_unref (mail_op); - g_object_unref (not_opened_headers); g_object_unref (account); } @@ -1134,13 +1192,19 @@ open_msgs_from_headers (TnyList *headers, ModestWindow *win) TnyHeaderFlags flags = 0; TnyAccount *account; gint uncached_msgs = 0; + GtkWidget *header_view; + GtkTreeModel *model; + GHashTable *refs_for_headers; + OpenMsgHelper *helper; + GtkTreeSelection *sel; + GList *sel_list = NULL, *sel_list_iter = NULL; g_return_if_fail (headers != NULL); /* Check that only one message is selected for opening */ if (tny_list_get_length (headers) != 1) { - modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL, - _("mcen_ib_select_one_message")); + modest_platform_information_banner ((win) ? GTK_WIDGET (win) : NULL, + NULL, _("mcen_ib_select_one_message")); return; } @@ -1149,12 +1213,27 @@ open_msgs_from_headers (TnyList *headers, ModestWindow *win) /* Get the account */ account = get_account_from_header_list (headers); - + + if (!account) + return; + + /* Get the selections, we need to get the references to the + rows here because the treeview/model could dissapear (the + user might want to select another folder)*/ + header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), + MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (header_view)); + model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)); + sel_list = gtk_tree_selection_get_selected_rows (sel, &model); + refs_for_headers = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, + (GDestroyNotify) gtk_tree_row_reference_free); + /* Look if we already have a message view for each header. If true, then remove the header from the list of headers to open */ + sel_list_iter = sel_list; not_opened_headers = tny_simple_list_new (); - while (!tny_iterator_is_done (iter)) { + while (!tny_iterator_is_done (iter) && sel_list_iter) { ModestWindow *window = NULL; TnyHeader *header = NULL; @@ -1170,27 +1249,39 @@ open_msgs_from_headers (TnyList *headers, ModestWindow *win) /* Do not open again the message and present the window to the user */ if (found) { - if (window) + if (window) { gtk_window_present (GTK_WINDOW (window)); - else + } else { /* the header has been registered already, we don't do * anything but wait for the window to come up*/ g_debug ("header %p already registered, waiting for window", header); + } } else { + GtkTreeRowReference *row_reference; + tny_list_append (not_opened_headers, G_OBJECT (header)); + /* Create a new row reference and add it to the hash table */ + row_reference = gtk_tree_row_reference_new (model, (GtkTreePath *) sel_list_iter->data); + g_hash_table_insert (refs_for_headers, header, row_reference); } if (header) g_object_unref (header); + /* Go to next */ tny_iterator_next (iter); + sel_list_iter = g_list_next (sel_list_iter); } g_object_unref (iter); iter = NULL; + g_list_foreach (sel_list, (GFunc) gtk_tree_path_free, NULL); + g_list_free (sel_list); /* Open each message */ - if (tny_list_get_length (not_opened_headers) == 0) + if (tny_list_get_length (not_opened_headers) == 0) { + g_hash_table_destroy (refs_for_headers); 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) @@ -1211,8 +1302,10 @@ open_msgs_from_headers (TnyList *headers, ModestWindow *win) uncached_msgs)); /* End if the user does not want to continue */ - if (response == GTK_RESPONSE_CANCEL) + if (response == GTK_RESPONSE_CANCEL) { + g_hash_table_destroy (refs_for_headers); goto cleanup; + } } } } @@ -1230,14 +1323,23 @@ open_msgs_from_headers (TnyList *headers, ModestWindow *win) g_object_unref (iter_not_opened); iter_not_opened = NULL; + /* Create the helper. We need to get a reference to the model + here because it could change while the message is readed + (the user could switch between folders) */ + helper = g_slice_new (OpenMsgHelper); + helper->model = g_object_ref (model); + helper->headers = g_object_ref (not_opened_headers); + helper->row_refs_per_header = refs_for_headers; + helper->banner_info = NULL; + /* Connect to the account and perform */ if (uncached_msgs > 0) { modest_platform_connect_and_perform ((GtkWindow *) win, TRUE, g_object_ref (account), - open_msgs_performer, g_object_ref (not_opened_headers)); + open_msgs_performer, helper); } 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)); + open_msgs_performer (FALSE, NULL, (GtkWindow *) win, + g_object_ref (account), helper); } cleanup: /* Clean */ @@ -1472,8 +1574,10 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) * whether he/she wants to download them. */ 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 (account) { + continue_download = connect_to_get_msg (win, num_of_unc_msgs, account); + g_object_unref (account); + } } } @@ -1530,7 +1634,7 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) if (do_retrieve) { mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(win), - modest_ui_actions_get_msgs_full_error_handler, + modest_ui_actions_disk_operations_error_handler, NULL, NULL); modest_mail_operation_queue_add ( modest_runtime_get_mail_operation_queue (), mail_op); @@ -1696,6 +1800,8 @@ typedef struct { TnyAccount *account; ModestWindow *win; gchar *account_name; + gboolean poke_status; + gboolean interactive; } SendReceiveInfo; static void @@ -1730,7 +1836,7 @@ do_send_receive_performer (gboolean canceled, /* 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, (info->win) ? FALSE : TRUE, + modest_mail_operation_update_account (mail_op, info->account_name, info->poke_status, info->interactive, (info->win) ? retrieve_all_messages_cb : NULL, new_messages_arrived, info->win); g_object_unref (G_OBJECT (mail_op)); @@ -1755,6 +1861,8 @@ do_send_receive_performer (gboolean canceled, void modest_ui_actions_do_send_receive (const gchar *account_name, gboolean force_connection, + gboolean poke_status, + gboolean interactive, ModestWindow *win) { gchar *acc_name = NULL; @@ -1782,6 +1890,8 @@ modest_ui_actions_do_send_receive (const gchar *account_name, info = g_slice_new (SendReceiveInfo); info->account_name = acc_name; info->win = (win) ? g_object_ref (win) : NULL; + info->poke_status = poke_status; + info->interactive = interactive; info->account = modest_tny_account_store_get_server_account (acc_store, acc_name, TNY_ACCOUNT_TYPE_STORE); @@ -1870,7 +1980,9 @@ modest_ui_actions_cancel_send (GtkAction *action, ModestWindow *win) */ void modest_ui_actions_do_send_receive_all (ModestWindow *win, - gboolean force_connection) + gboolean force_connection, + gboolean poke_status, + gboolean interactive) { GSList *account_names, *iter; @@ -1879,7 +1991,9 @@ modest_ui_actions_do_send_receive_all (ModestWindow *win, iter = account_names; while (iter) { - modest_ui_actions_do_send_receive ((const char*) iter->data, force_connection, win); + modest_ui_actions_do_send_receive ((const char*) iter->data, + force_connection, + poke_status, interactive, win); iter = g_slist_next (iter); } @@ -1920,8 +2034,9 @@ modest_ui_actions_on_send_receive (GtkAction *action, ModestWindow *win) g_object_unref (folder_store); } - /* Refresh the active account. Force the connection if needed */ - modest_ui_actions_do_send_receive (NULL, TRUE, win); + /* Refresh the active account. Force the connection if needed + and poke the status of all folders */ + modest_ui_actions_do_send_receive (NULL, TRUE, TRUE, TRUE, win); } @@ -1989,6 +2104,7 @@ modest_ui_actions_on_header_selected (ModestHeaderView *header_view, gtk_widget_grab_focus (GTK_WIDGET(header_view)); /* Update toolbar dimming state */ + modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (main_window)); modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window)); } @@ -2261,15 +2377,10 @@ on_save_to_drafts_cb (ModestMailOperation *mail_op, edit_window = MODEST_MSG_EDIT_WINDOW (user_data); - /* It might not be a good idea to do nothing if there was an error, - * so let's at least show a generic error banner. */ - /* TODO error while saving attachment, show "Saving draft failed" banner */ - if (modest_mail_operation_get_error (mail_op) != NULL) { - g_warning ("%s failed: %s\n", __FUNCTION__, (modest_mail_operation_get_error (mail_op))->message); - modest_platform_information_banner (NULL, NULL, _("mail_ib_file_operation_failed")); - } else { + /* Set draft is there was no error */ + if (!modest_mail_operation_get_error (mail_op)) modest_msg_edit_window_set_draft (edit_window, saved_draft); - } + g_object_unref(edit_window); } @@ -2286,6 +2397,7 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi guint64 available_disk, expected_size; gint parts_count; guint64 parts_size; + ModestMainWindow *win; g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window), FALSE); @@ -2336,7 +2448,8 @@ 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 (NULL); + mail_operation = modest_mail_operation_new_with_error_handling (NULL, modest_ui_actions_disk_operations_error_handler, + NULL, NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_operation); modest_mail_operation_save_to_drafts (mail_operation, @@ -2355,9 +2468,19 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi on_save_to_drafts_cb, g_object_ref(edit_window)); -/* info_text = g_strdup_printf (_("mail_va_saved_to_drafts"), _("mcen_me_folder_drafts")); */ - modest_platform_information_banner (NULL, NULL, _CS("sfil_ib_saving")); - modest_msg_edit_window_reset_modified (edit_window); + /* Use the main window as the parent of the banner, if the + main window does not exist it won't be shown, if the parent + window exists then it's properly shown. We don't use the + editor window because it could be closed (save to drafts + could happen after closing the window */ + win = (ModestMainWindow *) + modest_window_mgr_get_main_window( modest_runtime_get_window_mgr(), FALSE); + if (win) { + gchar *text = g_strdup_printf (_("mail_va_saved_to_drafts"), _("mcen_me_folder_drafts")); + modest_platform_information_banner (GTK_WIDGET (win), NULL, text); + g_free (text); + } + modest_msg_edit_window_set_modified (edit_window, FALSE); /* Frees */ g_free (from); @@ -2382,8 +2505,6 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi * 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 (!had_error && win != NULL) { ModestFolderView *view = MODEST_FOLDER_VIEW(modest_main_window_get_child_widget( win, MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW)); @@ -2422,9 +2543,6 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) if (!modest_msg_edit_window_check_names (edit_window, TRUE)) return TRUE; - /* 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); /* Check size */ @@ -2678,11 +2796,20 @@ do_create_folder_cb (ModestMailOperation *mail_op, GtkWindow *source_win = (GtkWindow *) modest_mail_operation_get_source (mail_op); if (modest_mail_operation_get_error (mail_op)) { - /* Show an error */ - modest_platform_information_banner (GTK_WIDGET (source_win), NULL, - _("mail_in_ui_folder_create_error")); - /* Try again */ + /* Show an error. If there was some problem writing to + disk, show it, otherwise show the generic folder + create error. We do it here and not in an error + handler because the call to do_create_folder will + stop the main loop in a gtk_dialog_run and then, + the message won't be shown until that dialog is + closed */ + modest_ui_actions_disk_operations_error_handler (mail_op, + _("mail_in_ui_folder_create_error")); + + /* Try again. Do *NOT* show any error because the mail + operations system will do it for us because we + created the mail_op with new_with_error_handler */ do_create_folder (source_win, parent_folder, (const gchar *) suggested_name); } else { /* the 'source_win' is either the ModestMainWindow, or the 'Move to folder'-dialog @@ -2723,8 +2850,7 @@ do_create_folder (GtkWindow *parent_window, if (result == GTK_RESPONSE_ACCEPT) { ModestMailOperation *mail_op; - mail_op = modest_mail_operation_new (G_OBJECT(parent_window)); - + mail_op = modest_mail_operation_new (NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); modest_mail_operation_create_folder (mail_op, @@ -2793,7 +2919,6 @@ static void modest_ui_actions_rename_folder_error_handler (ModestMailOperation *mail_op, gpointer user_data) { - ModestMainWindow *window = MODEST_MAIN_WINDOW (user_data); const GError *error = NULL; const gchar *message = NULL; @@ -2807,12 +2932,12 @@ modest_ui_actions_rename_folder_error_handler (ModestMailOperation *mail_op, message = _CS("ckdg_ib_folder_already_exists"); break; default: - g_warning ("%s: BUG: unexpected error:[%d]: %s", __FUNCTION__, - error->code, error->message); - return; + message = _("emev_ib_ui_imap_unable_to_rename"); } - modest_platform_information_banner (GTK_WIDGET (window), NULL, message); + /* We don't set a parent for the dialog because the dialog + will be destroyed so the banner won't appear */ + modest_platform_information_banner (NULL, NULL, message); } typedef struct { @@ -2825,9 +2950,15 @@ on_rename_folder_cb (ModestMailOperation *mail_op, TnyFolder *new_folder, gpointer user_data) { - /* Select now */ - modest_folder_view_select_folder (MODEST_FOLDER_VIEW (user_data), - new_folder, FALSE); + ModestFolderView *folder_view; + + folder_view = MODEST_FOLDER_VIEW (user_data); + /* Note that if the rename fails new_folder will be NULL */ + if (new_folder) { + modest_folder_view_select_folder (folder_view, new_folder, FALSE); + } else { + modest_folder_view_select_first_inbox_or_local (folder_view); + } } static void @@ -2957,6 +3088,7 @@ on_delete_folder_cb (gboolean canceled, if (!MODEST_IS_MAIN_WINDOW(parent_window) || canceled || (err!=NULL)) { g_object_unref (G_OBJECT (info->folder)); g_free (info); + return; } folder_view = modest_main_window_get_child_widget ( @@ -3050,26 +3182,6 @@ modest_ui_actions_on_move_folder_to_trash_folder (GtkAction *action, ModestMainW } -static void -show_error (GtkWidget *parent_widget, const gchar* text) -{ - modest_platform_information_banner(parent_widget, NULL, text); - -#if 0 - GtkDialog *dialog = GTK_DIALOG (hildon_note_new_information (parent_window, text)); */ - /* - GtkDialog *dialog = GTK_DIALOG (gtk_message_dialog_new (parent_window, - (GtkDialogFlags)0, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, - text )); - */ - - gtk_dialog_run (dialog); - gtk_widget_destroy (GTK_WIDGET (dialog)); -#endif -} - void modest_ui_actions_on_password_requested (TnyAccountStore *account_store, const gchar* server_account_name, @@ -3080,6 +3192,7 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store, ModestMainWindow *main_window) { g_return_if_fail(server_account_name); + gboolean completed = FALSE; /* Initalize output parameters: */ if (cancel) @@ -3197,49 +3310,58 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store, */ gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox)); + + while (!completed) { - if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { - if (username) { - *username = g_strdup (gtk_entry_get_text (GTK_ENTRY(entry_username))); - - modest_account_mgr_set_server_account_username ( - modest_runtime_get_account_mgr(), server_account_name, - *username); - - const gboolean username_was_changed = - (strcmp (*username, initial_username) != 0); - if (username_was_changed) { - g_warning ("%s: tinymail does not yet support changing the " - "username in the get_password() callback.\n", __FUNCTION__); + if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { + if (username) { + *username = g_strdup (gtk_entry_get_text (GTK_ENTRY(entry_username))); + + /* Note that an empty field becomes the "" string */ + if (*username && strlen (*username) > 0) { + modest_account_mgr_set_server_account_username (modest_runtime_get_account_mgr(), + server_account_name, + *username); + completed = TRUE; + + const gboolean username_was_changed = + (strcmp (*username, initial_username) != 0); + if (username_was_changed) { + g_warning ("%s: tinymail does not yet support changing the " + "username in the get_password() callback.\n", __FUNCTION__); + } + } else { + /* Show error */ + modest_platform_information_banner (GTK_WIDGET (dialog), NULL, + _("mcen_ib_username_pw_incorrect")); + completed = FALSE; + } } - } - if (password) { - *password = g_strdup (gtk_entry_get_text (GTK_ENTRY(entry_password))); + if (password) { + *password = g_strdup (gtk_entry_get_text (GTK_ENTRY(entry_password))); - /* We do not save the password in the configuration, - * because this function is only called for passwords that should - * not be remembered: - modest_server_account_set_password ( + /* We do not save the password in the configuration, + * because this function is only called for passwords that should + * not be remembered: + modest_server_account_set_password ( modest_runtime_get_account_mgr(), server_account_name, *password); - */ + */ + } + if (cancel) + *cancel = FALSE; + } else { + /* Set parent to NULL or the banner will disappear with its parent dialog */ + modest_platform_information_banner(NULL, NULL, _("mail_ib_login_cancelled")); + completed = TRUE; + if (username) + *username = NULL; + if (password) + *password = NULL; + if (cancel) + *cancel = TRUE; } - - if (cancel) - *cancel = FALSE; - - } else { - show_error(GTK_WIDGET (main_window), _("mail_ib_login_cancelled")); - - if (username) - *username = NULL; - - if (password) - *password = NULL; - - if (cancel) - *cancel = TRUE; } /* This is not in the Maemo UI spec: @@ -3271,9 +3393,11 @@ modest_ui_actions_on_cut (GtkAction *action, GtkTextBuffer *buffer; buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused_widget)); - gtk_text_buffer_cut_clipboard (buffer, clipboard, TRUE); - gtk_clipboard_set_can_store (clipboard, NULL, 0); - gtk_clipboard_store (clipboard); + if (modest_text_utils_buffer_selection_is_valid (buffer)) { + gtk_text_buffer_cut_clipboard (buffer, clipboard, TRUE); + gtk_clipboard_set_can_store (clipboard, NULL, 0); + gtk_clipboard_store (clipboard); + } } else if (MODEST_IS_HEADER_VIEW (focused_widget)) { TnyList *header_list = modest_header_view_get_selected_headers ( MODEST_HEADER_VIEW (focused_widget)); @@ -3284,8 +3408,10 @@ modest_ui_actions_on_cut (GtkAction *action, 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 (account) { + continue_download = connect_to_get_msg (window, num_of_unc_msgs, account); + g_object_unref (account); + } } if (num_of_unc_msgs == 0 || continue_download) { @@ -3313,7 +3439,10 @@ modest_ui_actions_on_copy (GtkAction *action, focused_widget = gtk_window_get_focus (GTK_WINDOW (window)); if (GTK_IS_LABEL (focused_widget)) { - gtk_clipboard_set_text (clipboard, gtk_label_get_text (GTK_LABEL (focused_widget)), -1); + gchar *selection; + selection = modest_text_utils_label_get_selection (GTK_LABEL (focused_widget)); + gtk_clipboard_set_text (clipboard, selection, -1); + g_free (selection); gtk_clipboard_set_can_store (clipboard, NULL, 0); gtk_clipboard_store (clipboard); } else if (GTK_IS_EDITABLE (focused_widget)) { @@ -3327,9 +3456,11 @@ modest_ui_actions_on_copy (GtkAction *action, } else if (GTK_IS_TEXT_VIEW (focused_widget)) { GtkTextBuffer *buffer; buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused_widget)); - gtk_text_buffer_copy_clipboard (buffer, clipboard); - gtk_clipboard_set_can_store (clipboard, NULL, 0); - gtk_clipboard_store (clipboard); + if (modest_text_utils_buffer_selection_is_valid (buffer)) { + gtk_text_buffer_copy_clipboard (buffer, clipboard); + gtk_clipboard_set_can_store (clipboard, NULL, 0); + gtk_clipboard_store (clipboard); + } } else if (MODEST_IS_HEADER_VIEW (focused_widget)) { TnyList *header_list = modest_header_view_get_selected_headers ( MODEST_HEADER_VIEW (focused_widget)); @@ -3340,8 +3471,10 @@ modest_ui_actions_on_copy (GtkAction *action, 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 (account) { + continue_download = connect_to_get_msg (window, num_of_unc_msgs, account); + g_object_unref (account); + } } if (num_of_unc_msgs == 0 || continue_download) { @@ -3960,9 +4093,11 @@ on_move_to_dialog_folder_selection_changed (ModestFolderView* self, GtkWidget *folder_view = NULL; ModestTnyFolderRules rules; + g_return_if_fail (MODEST_IS_FOLDER_VIEW(self)); + if (!selected) return; - + /* Get the OK button */ dialog = gtk_widget_get_ancestor (GTK_WIDGET (self), GTK_TYPE_DIALOG); if (!dialog) @@ -3996,6 +4131,7 @@ on_move_to_dialog_folder_selection_changed (ModestFolderView* self, new_sensitive = (proto != MODEST_PROTOCOL_STORE_POP); } g_object_unref (local_account); + g_object_unref (mmc_account); } /* Check the target folder rules */ @@ -4044,25 +4180,36 @@ on_move_to_dialog_folder_selection_changed (ModestFolderView* self, } g_object_unref (moved_folder); } else { - TnyHeader *header = NULL; TnyFolder *src_folder = NULL; /* Moving a message */ if (MODEST_IS_MSG_VIEW_WINDOW (user_data)) { - header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (user_data)); - src_folder = tny_header_get_folder (header); - g_object_unref (header); + + TnyHeader *header = NULL; + header = modest_msg_view_window_get_header + (MODEST_MSG_VIEW_WINDOW (user_data)); + if (!TNY_IS_HEADER(header)) + g_warning ("%s: could not get source header", __FUNCTION__); + else + src_folder = tny_header_get_folder (header); + + if (header) + g_object_unref (header); } else { src_folder = - TNY_FOLDER (modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view))); + TNY_FOLDER (modest_folder_view_get_selected + (MODEST_FOLDER_VIEW (folder_view))); } - /* Do not allow to move the msg to the same folder */ - /* Do not allow to move the msg to an account */ - if ((gpointer) src_folder == (gpointer) folder_store || - TNY_IS_ACCOUNT (folder_store)) - ok_sensitive = FALSE; - g_object_unref (src_folder); + if (TNY_IS_FOLDER(src_folder)) { + /* Do not allow to move the msg to the same folder */ + /* Do not allow to move the msg to an account */ + if ((gpointer) src_folder == (gpointer) folder_store || + TNY_IS_ACCOUNT (folder_store)) + ok_sensitive = FALSE; + g_object_unref (src_folder); + } else + g_warning ("%s: could not get source folder", __FUNCTION__); } end: @@ -4304,11 +4451,8 @@ move_to_cb (ModestMailOperation *mail_op, if (MODEST_IS_MSG_VIEW_WINDOW (object)) { ModestMsgViewWindow *self = MODEST_MSG_VIEW_WINDOW (object); - if (modest_msg_view_window_last_message_selected (self) && - modest_msg_view_window_first_message_selected (self)) { - modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (self)); - } else if (!modest_msg_view_window_select_next_message (self) && - !modest_msg_view_window_select_previous_message (self)) { + if (!modest_msg_view_window_select_next_message (self) && + !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)); } @@ -4339,7 +4483,17 @@ folder_move_to_cb (ModestMailOperation *mail_op, TnyFolder *new_folder, gpointer user_data) { + GtkWidget *folder_view; + GObject *object; + + object = modest_mail_operation_get_source (mail_op); + folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(object), + MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); + g_object_ref (folder_view); + g_object_unref (object); move_to_cb (mail_op, user_data); + modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view), new_folder, FALSE); + g_object_unref (folder_view); } static void @@ -4467,6 +4621,7 @@ open_msg_for_purge_cb (ModestMailOperation *mail_op, tny_iterator_next (iter); } + g_object_unref (iter); tny_msg_rewrite_cache (msg); } @@ -4474,7 +4629,6 @@ open_msg_for_purge_cb (ModestMailOperation *mail_op, /* 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); modest_window_mgr_unregister_header (mgr, header); @@ -4487,7 +4641,6 @@ modest_ui_actions_on_main_window_remove_attachments (GtkAction *action, { GtkWidget *header_view; TnyList *header_list; - TnyIterator *iter; TnyHeader *header; TnyHeaderFlags flags; ModestWindow *msg_view_window = NULL; @@ -4505,7 +4658,7 @@ modest_ui_actions_on_main_window_remove_attachments (GtkAction *action, } if (tny_list_get_length (header_list) == 1) { - iter = tny_list_create_iterator (header_list); + TnyIterator *iter = tny_list_create_iterator (header_list); header = TNY_HEADER (tny_iterator_get_current (iter)); g_object_unref (iter); } else @@ -4532,7 +4685,7 @@ modest_ui_actions_on_main_window_remove_attachments (GtkAction *action, ModestMailOperation *mail_op = NULL; 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, + modest_ui_actions_disk_operations_error_handler, 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); @@ -4545,14 +4698,97 @@ modest_ui_actions_on_main_window_remove_attachments (GtkAction *action, g_object_unref (header_list); } +/* + * Checks if we need a connection to do the transfer and if the user + * wants to connect to complete it + */ +void +modest_ui_actions_xfer_messages_check (GtkWindow *parent_window, + TnyFolderStore *src_folder, + TnyList *headers, + TnyFolder *dst_folder, + gboolean delete_originals, + gboolean *need_connection, + gboolean *do_xfer) +{ + TnyAccount *src_account; + gint uncached_msgs = 0; + + uncached_msgs = header_list_count_uncached_msgs (headers); + + /* We don't need any further check if + * + * 1- the source folder is local OR + * 2- the device is already online + */ + if (!modest_tny_folder_store_is_remote (src_folder) || + tny_device_is_online (modest_runtime_get_device())) { + *need_connection = FALSE; + *do_xfer = TRUE; + return; + } + + /* We must ask for a connection when + * + * - the message(s) is not already cached OR + * - the message(s) is cached but the leave_on_server setting + * is FALSE (because we need to sync the source folder to + * delete the message from the server (for IMAP we could do it + * offline, it'll take place the next time we get a + * connection) + */ + src_account = get_account_from_folder_store (src_folder); + if (uncached_msgs > 0) { + guint num_headers; + const gchar *msg; + + *need_connection = TRUE; + num_headers = tny_list_get_length (headers); + msg = ngettext ("mcen_nc_get_msg", "mcen_nc_get_msgs", num_headers); + + if (modest_platform_run_confirmation_dialog (parent_window, msg) == + GTK_RESPONSE_CANCEL) { + *do_xfer = FALSE; + } else { + *do_xfer = TRUE; + } + } else { + /* The transfer is possible and the user wants to */ + *do_xfer = TRUE; + + if (remote_folder_is_pop (src_folder) && delete_originals) { + const gchar *account_name; + gboolean leave_on_server; + + account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (src_account); + leave_on_server = modest_account_mgr_get_leave_on_server (modest_runtime_get_account_mgr (), + account_name); + + if (leave_on_server == TRUE) { + *need_connection = FALSE; + } else { + *need_connection = TRUE; + } + } else { + *need_connection = FALSE; + } + } + + /* Frees */ + g_object_unref (src_account); +} + + /** * Utility function that transfer messages from both the main window * and the msg view window when using the "Move to" dialog */ static void -xfer_messages_from_move_to_cb (gboolean canceled, GError *err, - GtkWindow *parent_window, - TnyAccount *account, gpointer user_data) +xfer_messages_performer (gboolean canceled, + GError *err, + GtkWindow *parent_window, + TnyAccount *account, + gpointer user_data) { TnyFolderStore *dst_folder = TNY_FOLDER_STORE (user_data); ModestWindow *win = MODEST_WINDOW (parent_window); @@ -4562,6 +4798,8 @@ xfer_messages_from_move_to_cb (gboolean canceled, GError *err, gboolean dst_is_pop = FALSE; if (canceled || err) { + /* Show the proper error message */ + modest_ui_actions_on_account_connection_error (parent_window, account); g_object_unref (dst_folder); return; } @@ -4629,36 +4867,6 @@ xfer_messages_from_move_to_cb (gboolean canceled, GError *err, } typedef struct { - TnyAccount *dst_account; - ModestConnectedPerformer callback; - gpointer data; -} DoubleConnectionInfo; - -static void -src_account_connect_performer (gboolean canceled, - GError *err, - GtkWindow *parent_window, - TnyAccount *src_account, - gpointer user_data) -{ - DoubleConnectionInfo *info = (DoubleConnectionInfo *) user_data; - - if (canceled || err) { - /* If there was any error call the user callback */ - info->callback (canceled, err, parent_window, src_account, info->data); - } else { - /* Connect the destination account */ - modest_platform_connect_if_remote_and_perform (parent_window, TRUE, - TNY_FOLDER_STORE (info->dst_account), - info->callback, info->data); - } - - /* Free the info object */ - g_object_unref (info->dst_account); - g_slice_free (DoubleConnectionInfo, info); -} - -typedef struct { TnyFolder *src_folder; TnyFolderStore *dst_folder; gboolean delete_original; @@ -4731,6 +4939,15 @@ on_move_folder_cb (gboolean canceled, GError *err, GtkWindow *parent_window, g_free (user_data); } +static TnyAccount * +get_account_from_folder_store (TnyFolderStore *folder_store) +{ + if (TNY_IS_ACCOUNT (folder_store)) + return g_object_ref (folder_store); + else + return tny_folder_get_account (TNY_FOLDER (folder_store)); +} + /* * UI handler for the "Move to" action when invoked from the * ModestMainWindow @@ -4742,8 +4959,7 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action, ModestMainWindow *win) { ModestHeaderView *header_view = NULL; - TnyFolderStore *src_folder; - gboolean online = (tny_device_is_online (modest_runtime_get_device())); + TnyFolderStore *src_folder = NULL; g_return_if_fail (MODEST_IS_MAIN_WINDOW (win)); @@ -4759,79 +4975,84 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action, /* Allow only to transfer folders to the local root folder */ if (TNY_IS_ACCOUNT (dst_folder) && - !MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (dst_folder)) { + !MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (dst_folder) && + !modest_tny_account_is_memory_card_account (TNY_ACCOUNT (dst_folder))) { do_xfer = FALSE; } else if (!TNY_IS_FOLDER (src_folder)) { g_warning ("%s: src_folder is not a TnyFolder.\n", __FUNCTION__); do_xfer = FALSE; - } /* else if (!online && modest_tny_folder_store_is_remote(src_folder)) { - 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) { + } + + if (do_xfer) { MoveFolderInfo *info = g_new0 (MoveFolderInfo, 1); - info->src_folder = TNY_FOLDER (src_folder); - info->dst_folder = dst_folder; + DoubleConnectionInfo *connect_info = g_slice_new (DoubleConnectionInfo); + + info->src_folder = g_object_ref (src_folder); + info->dst_folder = g_object_ref (dst_folder); info->delete_original = TRUE; info->folder_view = folder_view; - g_object_ref (G_OBJECT (info->src_folder)); - g_object_ref (G_OBJECT (info->dst_folder)); - modest_platform_connect_if_remote_and_perform(GTK_WINDOW (win), TRUE, - TNY_FOLDER_STORE (dst_folder), on_move_folder_cb, info); + + connect_info->callback = on_move_folder_cb; + connect_info->dst_account = get_account_from_folder_store (TNY_FOLDER_STORE (dst_folder)); + connect_info->data = info; + + modest_platform_double_connect_and_perform(GTK_WINDOW (win), TRUE, + TNY_FOLDER_STORE (src_folder), + connect_info); } } else if (gtk_widget_is_focus (GTK_WIDGET(header_view))) { - gboolean do_xfer = TRUE; + TnyList *headers; - /* Show an error when trying to move msgs to an account */ - if (!TNY_IS_FOLDER (dst_folder)) { - modest_platform_information_banner (GTK_WIDGET (win), - NULL, - _CS("ckdg_ib_unable_to_move_to_current_location")); - goto free; - } + headers = modest_header_view_get_selected_headers(header_view); - /* Ask for confirmation if the source folder is remote and we're not connected */ - if (!online && modest_tny_folder_store_is_remote(src_folder)) { - 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); - TnyAccount *account = get_account_from_header_list (headers); - GtkResponseType response; + /* Transfer the messages */ + transfer_messages_helper (GTK_WINDOW (win), TNY_FOLDER (src_folder), + headers, TNY_FOLDER (dst_folder)); - response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win), - ngettext("mcen_nc_get_msg", - "mcen_nc_get_msgs", - num_headers)); - if (response == GTK_RESPONSE_CANCEL) - do_xfer = FALSE; - - g_object_unref (account); - } - g_object_unref(headers); - } - if (do_xfer) /* Transfer messages */ { - DoubleConnectionInfo *info = g_slice_new (DoubleConnectionInfo); - info->callback = xfer_messages_from_move_to_cb; - info->dst_account = tny_folder_get_account (TNY_FOLDER (dst_folder)); - info->data = g_object_ref (dst_folder); - - modest_platform_connect_if_remote_and_perform(GTK_WINDOW (win), TRUE, - TNY_FOLDER_STORE (src_folder), - src_account_connect_performer, - info); - } + g_object_unref (headers); } - free: - if (src_folder) - g_object_unref (src_folder); + /* Frees */ + g_object_unref (src_folder); } +static void +transfer_messages_helper (GtkWindow *win, + TnyFolder *src_folder, + TnyList *headers, + TnyFolder *dst_folder) +{ + gboolean need_connection = TRUE; + gboolean do_xfer = TRUE; + + modest_ui_actions_xfer_messages_check (win, TNY_FOLDER_STORE (src_folder), + headers, TNY_FOLDER (dst_folder), + TRUE, &need_connection, + &do_xfer); + + /* If we don't want to transfer just return */ + if (!do_xfer) + return; + + if (need_connection) { + DoubleConnectionInfo *connect_info = g_slice_new (DoubleConnectionInfo); + connect_info->callback = xfer_messages_performer; + connect_info->dst_account = tny_folder_get_account (TNY_FOLDER (dst_folder)); + connect_info->data = g_object_ref (dst_folder); + + modest_platform_double_connect_and_perform(GTK_WINDOW (win), TRUE, + TNY_FOLDER_STORE (src_folder), + connect_info); + } else { + TnyAccount *src_account = get_account_from_folder_store (TNY_FOLDER_STORE (src_folder)); + xfer_messages_performer (FALSE, NULL, GTK_WINDOW (win), + src_account, + g_object_ref (dst_folder)); + g_object_unref (src_account); + } +} + /* * UI handler for the "Move to" action when invoked from the * ModestMsgViewWindow @@ -4841,36 +5062,25 @@ modest_ui_actions_on_msg_view_window_move_to (GtkAction *action, TnyFolderStore *dst_folder, ModestMsgViewWindow *win) { + TnyList *headers = NULL; TnyHeader *header = NULL; TnyFolder *src_folder = NULL; - TnyAccount *account = NULL; - gboolean do_xfer = FALSE; + + g_return_if_fail (TNY_IS_FOLDER (dst_folder)); /* Create header list */ - header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win)); + header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win)); src_folder = TNY_FOLDER (tny_header_get_folder(header)); - g_object_unref (header); + headers = tny_simple_list_new (); + tny_list_append (headers, G_OBJECT (header)); - account = tny_folder_get_account (src_folder); - if (!modest_tny_folder_store_is_remote(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) { - g_object_ref (dst_folder); - modest_platform_connect_if_remote_and_perform(GTK_WINDOW (win), TRUE, - TNY_FOLDER_STORE (dst_folder), xfer_messages_from_move_to_cb, dst_folder); - } - g_object_unref (account); - g_object_unref (src_folder); + /* Transfer the messages */ + transfer_messages_helper (GTK_WINDOW (win), src_folder, headers, + TNY_FOLDER (dst_folder)); + + /* Frees */ + g_object_unref (header); + g_object_unref (headers); } void @@ -5060,7 +5270,7 @@ retrieve_msg_contents_performer (gboolean canceled, /* Create mail operation */ mail_op = modest_mail_operation_new_with_error_handling ((GObject *) parent_window, - modest_ui_actions_get_msgs_full_error_handler, + modest_ui_actions_disk_operations_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); @@ -5305,21 +5515,20 @@ modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self, TnyTransportAccount *server_account; gchar *message = NULL; - /* Don't show anything if the user cancelled something */ - if (err->code == TNY_SYSTEM_ERROR_CANCEL) + /* Don't show anything if the user cancelled something or the send receive request is not + * interactive */ + if (err->code == TNY_SYSTEM_ERROR_CANCEL || + !modest_tny_send_queue_get_requested_send_receive (MODEST_TNY_SEND_QUEUE (self))) return; + /* Get the server name: */ server_account = TNY_TRANSPORT_ACCOUNT (tny_camel_send_queue_get_transport_account (TNY_CAMEL_SEND_QUEUE (self))); - if (server_account) { - server_name = tny_account_get_hostname (TNY_ACCOUNT (server_account)); - - g_object_unref (server_account); - server_account = NULL; - } - - g_return_if_fail (server_name); + if (server_account) + server_name = tny_account_get_hostname (TNY_ACCOUNT (server_account)); + else + g_return_if_reached (); /* Show the appropriate message text for the GError: */ switch (err->code) { @@ -5332,6 +5541,9 @@ modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self, case TNY_SERVICE_ERROR_SEND: message = g_strdup (_("emev_ib_ui_smtp_send_error")); break; + case TNY_SERVICE_ERROR_UNAVAILABLE: + message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name); + break; default: g_warning ("%s: unexpected ERROR %d", __FUNCTION__, err->code); @@ -5345,6 +5557,7 @@ modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self, modest_platform_run_information_dialog (NULL, message); g_free (message); + g_object_unref (server_account); } void