X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=811b72c19207b025821c16023fd4f7d71b426703;hp=5f7c8e3e6cf11a97a3f8a272bf29ddfbaa3d9794;hb=970d9aea8da383297896b002c56ce13c47e52e29;hpb=d4537d8a01b0789310de9a11d3344147ee9691c0 diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index 5f7c8e3..811b72c 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -41,9 +41,10 @@ #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 "modest-debug.h" #include #include #include @@ -51,9 +52,10 @@ #ifdef MODEST_PLATFORM_MAEMO #include "maemo/modest-osso-state-saving.h" -#include "maemo/modest-maemo-utils.h" #include "maemo/modest-hildon-includes.h" +#include "maemo/modest-connection-specific-smtp-window.h" #endif /* MODEST_PLATFORM_MAEMO */ +#include #include "widgets/modest-ui-constants.h" #include @@ -63,7 +65,6 @@ #include #include "widgets/modest-folder-view.h" #include "widgets/modest-global-settings-dialog.h" -#include "modest-connection-specific-smtp-window.h" #include "modest-account-mgr-helpers.h" #include "modest-mail-operation.h" #include "modest-text-utils.h" @@ -126,12 +127,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); @@ -154,6 +159,12 @@ static gboolean remote_folder_is_pop (const TnyFolderStore *folder); static gboolean msgs_already_deleted_from_server ( TnyList *headers, const TnyFolderStore *src_folder); +static void do_create_folder (GtkWindow *window, + TnyFolderStore *parent_folder, + const gchar *suggested_name); + +static GtkWidget* get_folder_view_from_move_to_dialog (GtkWidget *move_to_dialog); + /* * This function checks whether a TnyFolderStore is a pop account @@ -173,6 +184,11 @@ remote_folder_is_pop (const TnyFolderStore *folder) account = tny_folder_get_account(TNY_FOLDER(folder)); } + if (!TNY_IS_ACCOUNT(account)) { + g_warning ("%s: could not get account", __FUNCTION__); + return FALSE; + } + proto = tny_account_get_proto(account); g_object_unref (account); @@ -211,7 +227,7 @@ modest_ui_actions_run_account_setup_wizard (ModestWindow *win) /* Show the easy-setup wizard: */ dialog = modest_window_mgr_get_modal (modest_runtime_get_window_mgr()); - if (dialog && MODEST_IS_EASYSETUP_WIZARD_DIALOG(dialog)) { + if (dialog) { /* old wizard is active already; */ gtk_window_present (GTK_WINDOW(dialog)); @@ -220,7 +236,7 @@ modest_ui_actions_run_account_setup_wizard (ModestWindow *win) /* there is no such wizard yet */ - wizard = GTK_WINDOW (modest_easysetup_wizard_dialog_new ()); + wizard = GTK_WINDOW (modest_platform_get_account_settings_wizard ()); modest_window_mgr_set_modal (modest_runtime_get_window_mgr(), wizard); /* always present a main window in the background @@ -231,6 +247,7 @@ modest_ui_actions_run_account_setup_wizard (ModestWindow *win) 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)); @@ -245,7 +262,6 @@ modest_ui_actions_run_account_setup_wizard (ModestWindow *win) /* Check whether an account was created: */ result = modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE); } - return result; } @@ -372,22 +388,6 @@ headers_action_mark_as_unread (TnyHeader *header, } } -/** 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 (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. **/ @@ -395,10 +395,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)) { + 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); } @@ -493,7 +491,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)) { @@ -518,7 +516,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) { @@ -555,14 +557,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); @@ -597,8 +595,6 @@ modest_ui_actions_on_delete_message_or_folder (GtkAction *action, ModestWindow * modest_ui_actions_on_delete_message (action, win); } - - void modest_ui_actions_on_quit (GtkAction *action, ModestWindow *win) { @@ -673,9 +669,10 @@ 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_ui_actions_run_account_setup_wizard (win); + if (!modest_ui_actions_run_account_setup_wizard (win)) + g_debug ("%s: wizard was already running", __FUNCTION__); + return; } else { /* Show the list of accounts */ @@ -684,35 +681,11 @@ modest_ui_actions_on_accounts (GtkAction *action, /* 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)); + modest_utils_show_dialog_and_forget (GTK_WINDOW (win), GTK_DIALOG (account_win)); } -#else - GtkWidget *dialog, *label; - - /* Create the widgets */ - - dialog = gtk_dialog_new_with_buttons ("Message", - GTK_WINDOW(win), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_OK, - GTK_RESPONSE_NONE, - NULL); - label = gtk_label_new ("Hello World!"); - - /* Ensure that the dialog box is destroyed when the user responds. */ - - g_signal_connect_swapped (dialog, "response", - G_CALLBACK (gtk_widget_destroy), - dialog); - - /* Add the label, and show everything we've added to the dialog. */ - - gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox), - label); - gtk_widget_show_all (dialog); -#endif /* MODEST_PLATFORM_MAEMO */ } +#ifdef MODEST_PLATFORM_MAEMO static void on_smtp_servers_window_hide (GtkWindow* window, gpointer user_data) { @@ -721,7 +694,7 @@ on_smtp_servers_window_hide (GtkWindow* window, gpointer user_data) MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (window)); gtk_widget_destroy (GTK_WIDGET (window)); } - +#endif void @@ -769,8 +742,7 @@ modest_ui_actions_compose_msg(ModestWindow *win, ModestAccountMgr *mgr = modest_runtime_get_account_mgr(); ModestTnyAccountStore *store = modest_runtime_get_account_store(); - if (win) account_name = g_strdup (modest_window_get_active_account (win)); - if (!account_name) account_name = modest_account_mgr_get_default_account(mgr); + account_name = modest_account_mgr_get_default_account(mgr); if (!account_name) { g_printerr ("modest: no account found\n"); goto cleanup; @@ -813,11 +785,6 @@ modest_ui_actions_compose_msg(ModestWindow *win, attachments = g_slist_next(attachments); } modest_window_mgr_register_window (modest_runtime_get_window_mgr(), msg_win); - - if (win) { - gtk_window_set_transient_for (GTK_WINDOW (msg_win), - GTK_WINDOW (win)); - } gtk_widget_show_all (GTK_WIDGET (msg_win)); cleanup: @@ -835,13 +802,14 @@ 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; - } - + 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 modest_ui_actions_msg_retrieval_check (ModestMailOperation *mail_op, TnyHeader *header, @@ -864,7 +832,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; @@ -960,7 +933,8 @@ open_msg_cb (ModestMailOperation *mail_op, TnyHeader *header, TnyMsg *msg, gpoi /* Show banner */ - modest_platform_information_banner (NULL, NULL, _("mail_ib_opening_draft_message")); + 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); @@ -1002,7 +976,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)); } @@ -1018,36 +991,26 @@ cleanup: g_object_unref (folder); } - -static void -open_msg_error_handler (ModestMailOperation *mail_op, - gpointer user_data) -{ - /* Show the message error */ - GObject *win = modest_mail_operation_get_source (mail_op); - - modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL, - (gchar *) user_data); - if (win) - g_object_unref (win); -} - void 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; + win = modest_mail_operation_get_source (mail_op); error = modest_mail_operation_get_error (mail_op); - - if (error->code == MODEST_MAIL_OPERATION_ERROR_MESSAGE_SIZE_LIMIT) { - 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 */ + if (error->code == TNY_SYSTEM_ERROR_MEMORY || + error->code == TNY_IO_ERROR_WRITE || + error->code == TNY_IO_ERROR_READ) { + 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, user_data); } if (win) @@ -1075,20 +1038,102 @@ get_account_from_header_list (TnyList *headers) return account; } +static void +foreach_unregister_headers (gpointer data, + gpointer user_data) +{ + ModestWindowMgr *mgr = (ModestWindowMgr *) user_data; + TnyHeader *header = TNY_HEADER (data); + + modest_window_mgr_unregister_header (mgr, header); +} + +static void +open_msgs_performer(gboolean canceled, + GError *err, + GtkWindow *parent_window, + TnyAccount *account, + gpointer user_data) +{ + ModestMailOperation *mail_op = NULL; + const gchar *proto_name; + gchar *error_msg; + ModestTransportStoreProtocol proto; + TnyList *not_opened_headers; + TnyConnectionStatus status; + + not_opened_headers = TNY_LIST (user_data); + + 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 ()); + goto clean; + } + + /* 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 */ + clean: + if (mail_op) + 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, *iter_not_opened = NULL; - ModestMailOperation *mail_op = NULL; TnyList *not_opened_headers = NULL; TnyHeaderFlags flags = 0; TnyAccount *account; + gint uncached_msgs = 0; g_return_if_fail (headers != NULL); @@ -1152,26 +1197,24 @@ _modest_ui_actions_open (TnyList *headers, ModestWindow *win) * 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); + 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; + } } - g_object_unref (iter); - - /* Ask the user if there are any uncached messages */ - if (found && !connect_to_get_msg (win, - header_list_count_uncached_msgs (not_opened_headers), - account)) - goto cleanup; } /* Register the headers before actually creating the windows: */ @@ -1181,62 +1224,21 @@ _modest_ui_actions_open (TnyList *headers, ModestWindow *win) if (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; - /* Create the mail operation */ - if (tny_list_get_length (not_opened_headers) > 1) { - 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); - - modest_mail_operation_get_msgs_full (mail_op, - not_opened_headers, - open_msg_cb, - NULL, - 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)); } else { - TnyIterator *iter = tny_list_create_iterator (not_opened_headers); - TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter)); - const gchar *proto_name; - gchar *error_msg; - ModestTransportStoreProtocol proto; - - /* 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; - } - - if (proto == MODEST_PROTOCOL_STORE_POP) { - error_msg = g_strdup (_("emev_ni_ui_pop3_msg_recv_error")); - } else if (proto == MODEST_PROTOCOL_STORE_IMAP) { - error_msg = g_strdup_printf (_("emev_ni_ui_imap_message_not_available_in_server"), - tny_header_get_subject (header)); - } else { - error_msg = g_strdup (_("mail_ni_ui_folder_get_msg_folder_error")); - } - - /* Create and call the mail operation */ - mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT (win), - open_msg_error_handler, - error_msg, - g_free); - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); - - modest_mail_operation_get_msg (mail_op, header, open_msg_cb, NULL); - - g_object_unref (header); - g_object_unref (iter); + /* 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)); } - g_object_unref (mail_op); - cleanup: /* Clean */ if (account) @@ -1256,7 +1258,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); } @@ -1273,7 +1275,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; @@ -1305,19 +1311,23 @@ reply_forward_cb (ModestMailOperation *mail_op, TnyHeader *header, TnyMsg *msg, switch (rf_helper->action) { case ACTION_REPLY: new_msg = - modest_tny_msg_create_reply_msg (msg, header, from, signature, + modest_tny_msg_create_reply_msg (msg, header, from, + (use_signature) ? signature : NULL, rf_helper->reply_forward_type, MODEST_TNY_MSG_REPLY_MODE_SENDER); break; case ACTION_REPLY_TO_ALL: new_msg = - modest_tny_msg_create_reply_msg (msg, header, from, signature, rf_helper->reply_forward_type, + modest_tny_msg_create_reply_msg (msg, header, from, + (use_signature) ? signature : NULL, + rf_helper->reply_forward_type, MODEST_TNY_MSG_REPLY_MODE_ALL); edit_type = MODEST_EDIT_TYPE_REPLY; break; case ACTION_FORWARD: new_msg = - modest_tny_msg_create_forward_msg (msg, from, signature, rf_helper->reply_forward_type); + modest_tny_msg_create_forward_msg (msg, from, (use_signature) ? signature : NULL, + rf_helper->reply_forward_type); edit_type = MODEST_EDIT_TYPE_FORWARD; break; default: @@ -1416,7 +1426,7 @@ connect_to_get_msg (ModestWindow *win, if (response == GTK_RESPONSE_CANCEL) return FALSE; - return modest_platform_connect_and_wait(GTK_WINDOW (win), account); + return modest_platform_connect_and_wait((GtkWindow *) win, account); } /* @@ -1502,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); @@ -1534,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); } @@ -1641,9 +1651,99 @@ new_messages_arrived (ModestMailOperation *self, TnyList *new_headers, gpointer user_data) { - /* Notify new messages have been downloaded */ - if ((new_headers != NULL) && (tny_list_get_length (new_headers) > 0)) - modest_platform_on_new_headers_received (new_headers); + GObject *source; + gboolean show_visual_notifications; + + source = modest_mail_operation_get_source (self); + show_visual_notifications = (source) ? FALSE : TRUE; + if (source) + g_object_unref (source); + + /* Notify new messages have been downloaded. If the + send&receive was invoked by the user then do not show any + visual notification, only play a sound and activate the LED + (for the Maemo version) */ + if (TNY_IS_LIST(new_headers) && (tny_list_get_length (new_headers)) > 0) + modest_platform_on_new_headers_received (new_headers, + show_visual_notifications); + +} + +gboolean +retrieve_all_messages_cb (GObject *source, + guint num_msgs, + guint retrieve_limit) +{ + GtkWindow *window; + gchar *msg; + gint response; + + window = GTK_WINDOW (source); + msg = g_strdup_printf (_("mail_nc_msg_count_limit_exceeded"), + num_msgs, retrieve_limit); + + /* Ask the user if they want to retrieve all the messages */ + response = + modest_platform_run_confirmation_dialog_with_buttons (window, msg, + _("mcen_bd_get_all"), + _("mcen_bd_newest_only")); + /* Free and return */ + g_free (msg); + return (response == GTK_RESPONSE_ACCEPT) ? TRUE : FALSE; +} + +typedef struct { + TnyAccount *account; + ModestWindow *win; + gchar *account_name; +} SendReceiveInfo; + +static void +do_send_receive_performer (gboolean canceled, + GError *err, + GtkWindow *parent_window, + TnyAccount *account, + gpointer user_data) +{ + ModestMailOperation *mail_op; + SendReceiveInfo *info; + + info = (SendReceiveInfo *) user_data; + + 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 ((info->win) ? G_OBJECT (info->win) : NULL, + 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, (info->win) ? FALSE : TRUE, + (info->win) ? retrieve_all_messages_cb : NULL, + 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); } /* @@ -1653,16 +1753,19 @@ 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, + gboolean force_connection, + 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) { @@ -1673,42 +1776,19 @@ 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)); - - mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT (win), - modest_ui_actions_send_receive_error_handler, - NULL, NULL); - - g_signal_connect (G_OBJECT(mail_op), "operation-finished", - G_CALLBACK (on_send_receive_finished), - 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); - /* 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, + force_connection, info->account, + do_send_receive_performer, info); } @@ -1738,9 +1818,12 @@ modest_ui_actions_do_cancel_send (const gchar *account_name, MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND, "modest: could not find send queue for account\n"); } else { - /* Keeep messages in outbox folder */ - tny_send_queue_cancel (send_queue, FALSE, &error); - } + /* Cancel the current send */ + tny_account_cancel (TNY_ACCOUNT (transport_account)); + + /* Suspend all pending messages */ + tny_send_queue_cancel (send_queue, TNY_SEND_QUEUE_CANCEL_ACTION_SUSPEND, &error); + } frees: if (transport_account != NULL) @@ -1786,7 +1869,8 @@ modest_ui_actions_cancel_send (GtkAction *action, ModestWindow *win) * updates */ void -modest_ui_actions_do_send_receive_all (ModestWindow *win) +modest_ui_actions_do_send_receive_all (ModestWindow *win, + gboolean force_connection) { GSList *account_names, *iter; @@ -1795,7 +1879,7 @@ modest_ui_actions_do_send_receive_all (ModestWindow *win) iter = account_names; while (iter) { - modest_ui_actions_do_send_receive ((const char*) iter->data, win); + modest_ui_actions_do_send_receive ((const char*) iter->data, force_connection, win); iter = g_slist_next (iter); } @@ -1803,47 +1887,6 @@ modest_ui_actions_do_send_receive_all (ModestWindow *win) account_names = NULL; } -static void -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 */ @@ -1851,19 +1894,34 @@ void modest_ui_actions_on_send_receive (GtkAction *action, ModestWindow *win) { /* Check if accounts exist */ - gboolean accounts_exist = + gboolean accounts_exist; + + accounts_exist = modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE); /* If not, allow the user to create an account before trying to send/receive. */ if (!accounts_exist) modest_ui_actions_on_accounts (NULL, win); + + /* Refresh the current folder. The if is always TRUE it's just an extra check */ + if (MODEST_IS_MAIN_WINDOW (win)) { + GtkWidget *folder_view; + TnyFolderStore *folder_store; - /* Refresh the current folder if we're viewing a window */ - if (win) - refresh_current_folder (win); + 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)); - /* Refresh the active account */ - modest_ui_actions_do_send_receive (NULL, win); + if (folder_store) + g_object_unref (folder_store); + } + + /* Refresh the active account. Force the connection if needed */ + modest_ui_actions_do_send_receive (NULL, TRUE, win); } @@ -1942,12 +2000,12 @@ modest_ui_actions_on_header_activated (ModestHeaderView *header_view, TnyList *headers; g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window)); - + if (!header) return; if (modest_header_view_count_selected_headers (header_view) > 1) { - hildon_banner_show_information (NULL, NULL, _("mcen_ib_select_one_message")); + modest_platform_information_banner (NULL, NULL, _("mcen_ib_select_one_message")); return; } @@ -1956,7 +2014,7 @@ modest_ui_actions_on_header_activated (ModestHeaderView *header_view, /* 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); } @@ -1999,8 +2057,6 @@ folder_refreshed_cb (ModestMailOperation *mail_op, { ModestMainWindow *win = NULL; GtkWidget *header_view; - gboolean folder_empty = FALSE; - gboolean all_marked_as_deleted = FALSE; g_return_if_fail (TNY_IS_FOLDER (folder)); @@ -2015,14 +2071,12 @@ folder_refreshed_cb (ModestMailOperation *mail_op, if (current_folder != NULL && folder != current_folder) { g_object_unref (current_folder); return; - } - g_object_unref (current_folder); + } else if (current_folder) + g_object_unref (current_folder); } /* Check if folder is empty and set headers view contents style */ - folder_empty = (tny_folder_get_all_count (folder) == 0); - all_marked_as_deleted = modest_header_view_is_empty (MODEST_HEADER_VIEW(header_view)); - if (folder_empty || all_marked_as_deleted) + if (tny_folder_get_all_count (folder) == 0) modest_main_window_set_contents_style (win, MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY); } @@ -2192,17 +2246,34 @@ on_save_to_drafts_cb (ModestMailOperation *mail_op, gpointer user_data) { ModestMsgEditWindow *edit_window; + ModestMainWindow *win; - edit_window = MODEST_MSG_EDIT_WINDOW (user_data); + /* 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); + } - /* If there was any error do nothing */ - if (modest_mail_operation_get_error (mail_op) != NULL) - return; + edit_window = MODEST_MSG_EDIT_WINDOW (user_data); - modest_msg_edit_window_set_draft (edit_window, saved_draft); + /* 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 { + modest_msg_edit_window_set_draft (edit_window, saved_draft); + } + g_object_unref(edit_window); } -void +gboolean modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edit_window) { TnyTransportAccount *transport_account; @@ -2210,12 +2281,31 @@ 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; */ + gboolean had_error = FALSE; + guint64 available_disk, expected_size; + gint parts_count; + guint64 parts_size; - g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window)); + g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window), FALSE); data = modest_msg_edit_window_get_msg_data (edit_window); + /* Check size */ + available_disk = modest_folder_available_space (NULL); + modest_msg_edit_window_get_parts_size (edit_window, &parts_count, &parts_size); + expected_size = modest_tny_msg_estimate_size (data->plain_body, + data->html_body, + parts_count, + parts_size); + + if ((available_disk != -1) && expected_size > available_disk) { + modest_msg_edit_window_free_msg_data (edit_window, data); + + modest_platform_information_banner (NULL, NULL, dgettext("ke-recv", "cerm_device_memory_full")); + return FALSE; + } + account_name = g_strdup (data->account_name); account_mgr = modest_runtime_get_account_mgr(); if (!account_name) @@ -2225,7 +2315,7 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi if (!account_name) { g_printerr ("modest: no account found\n"); modest_msg_edit_window_free_msg_data (edit_window, data); - return; + return FALSE; } if (!strcmp (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) { @@ -2241,12 +2331,12 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi g_printerr ("modest: no transport account found for '%s'\n", account_name); g_free (account_name); modest_msg_edit_window_free_msg_data (edit_window, data); - return; + return FALSE; } from = modest_account_mgr_get_from_string (account_mgr, account_name); /* Create the mail operation */ - mail_operation = modest_mail_operation_new (G_OBJECT(edit_window)); + mail_operation = modest_mail_operation_new (NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_operation); modest_mail_operation_save_to_drafts (mail_operation, @@ -2263,7 +2353,12 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi data->images, data->priority_flags, on_save_to_drafts_cb, - edit_window); + 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); + /* Frees */ g_free (from); g_free (account_name); @@ -2272,30 +2367,85 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi 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); - modest_msg_edit_window_reset_modified (edit_window); - g_free (info_text); + /* ** 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 (!had_error && 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); + } + } + + return !had_error; } /* For instance, when clicking the Send toolbar button when editing a message: */ -void +gboolean modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) { - g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window)); + TnyTransportAccount *transport_account = NULL; + gboolean had_error = FALSE; + guint64 available_disk, expected_size; + gint parts_count; + guint64 parts_size; + + g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window), TRUE); if (!modest_msg_edit_window_check_names (edit_window, TRUE)) - return; + 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 */ + available_disk = modest_folder_available_space (NULL); + modest_msg_edit_window_get_parts_size (edit_window, &parts_count, &parts_size); + expected_size = modest_tny_msg_estimate_size (data->plain_body, + data->html_body, + parts_count, + parts_size); + + if ((available_disk != -1) && expected_size > available_disk) { + modest_msg_edit_window_free_msg_data (edit_window, data); + + modest_platform_information_banner (NULL, NULL, dgettext("ke-recv", "cerm_device_memory_full")); + return FALSE; + } + ModestAccountMgr *account_mgr = modest_runtime_get_account_mgr(); gchar *account_name = g_strdup (data->account_name); if (!account_name) - g_strdup(modest_window_get_active_account (MODEST_WINDOW(edit_window))); + 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); @@ -2303,25 +2453,29 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) if (!account_name) { modest_msg_edit_window_free_msg_data (edit_window, data); /* Run account setup wizard */ - if (!modest_ui_actions_run_account_setup_wizard (MODEST_WINDOW(edit_window))) - return; + if (!modest_ui_actions_run_account_setup_wizard (MODEST_WINDOW(edit_window))) { + return TRUE; + } } /* 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)); + } + if (!transport_account) { + modest_msg_edit_window_free_msg_data (edit_window, data); /* Run account setup wizard */ if (!modest_ui_actions_run_account_setup_wizard(MODEST_WINDOW(edit_window))) - return; + return TRUE; } gchar *from = modest_account_mgr_get_from_string (account_mgr, account_name); /* Create the mail operation */ - ModestMailOperation *mail_operation = modest_mail_operation_new (G_OBJECT(edit_window)); + ModestMailOperation *mail_operation = modest_mail_operation_new (NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_operation); modest_mail_operation_send_new_mail (mail_operation, @@ -2337,6 +2491,19 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) data->attachments, data->images, data->priority_flags); + + if (modest_mail_operation_get_status (mail_operation) == MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS) + modest_platform_information_banner (NULL, NULL, _("mcen_ib_outbox_waiting_to_be_sent")); + + + if (modest_mail_operation_get_error (mail_operation) != NULL) { + const GError *error = modest_mail_operation_get_error (mail_operation); + if (error->code == MODEST_MAIL_OPERATION_ERROR_INSTANCE_CREATION_FAILED) { + g_warning ("%s failed: %s\n", __FUNCTION__, (modest_mail_operation_get_error (mail_operation))->message); + modest_platform_information_banner (NULL, NULL, _CS("sfil_ni_not_enough_memory")); + had_error = TRUE; + } + } /* Free data: */ g_free (from); @@ -2345,10 +2512,15 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) g_object_unref (G_OBJECT (mail_operation)); modest_msg_edit_window_free_msg_data (edit_window, data); - modest_msg_edit_window_set_sent (edit_window, TRUE); - /* Save settings and close the window: */ - modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (edit_window)); + if (!had_error) { + modest_msg_edit_window_set_sent (edit_window, TRUE); + + /* Save settings and close the window: */ + modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (edit_window)); + } + + return !had_error; } void @@ -2497,16 +2669,91 @@ modest_ui_actions_on_remove_attachments (GtkAction *action, } static void -modest_ui_actions_new_folder_error_handler (ModestMailOperation *mail_op, - gpointer user_data) +do_create_folder_cb (ModestMailOperation *mail_op, + TnyFolderStore *parent_folder, + TnyFolder *new_folder, + gpointer user_data) { - ModestMainWindow *window = MODEST_MAIN_WINDOW (user_data); - const GError *error = modest_mail_operation_get_error (mail_op); + gchar *suggested_name = (gchar *) user_data; + GtkWindow *source_win = (GtkWindow *) modest_mail_operation_get_source (mail_op); - if(error) { - modest_platform_information_banner (GTK_WIDGET (window), NULL, + 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 */ + 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 + * FIXME: any other? */ + GtkWidget *folder_view; + + if (MODEST_IS_MAIN_WINDOW(source_win)) + folder_view = + modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (source_win), + MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); + else + folder_view = + get_folder_view_from_move_to_dialog (GTK_WIDGET(source_win)); + + /* Select the newly created folder */ + modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view), + new_folder, FALSE); + g_object_unref (new_folder); } + /* Free. Note that the first time it'll be NULL so noop */ + g_free (suggested_name); + g_object_unref (source_win); +} + +static void +do_create_folder (GtkWindow *parent_window, + TnyFolderStore *parent_folder, + const gchar *suggested_name) +{ + gint result; + gchar *folder_name = NULL; + + result = modest_platform_run_new_folder_dialog (GTK_WINDOW (parent_window), + parent_folder, + (gchar *) suggested_name, + &folder_name); + + if (result == GTK_RESPONSE_ACCEPT) { + ModestMailOperation *mail_op; + + mail_op = modest_mail_operation_new (G_OBJECT(parent_window)); + + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), + mail_op); + modest_mail_operation_create_folder (mail_op, + parent_folder, + (const gchar *) folder_name, + do_create_folder_cb, + folder_name); + g_object_unref (mail_op); + } +} + +static void +create_folder_performer (gboolean canceled, + GError *err, + GtkWindow *parent_window, + TnyAccount *account, + gpointer user_data) +{ + TnyFolderStore *parent_folder = TNY_FOLDER_STORE (user_data); + + if (canceled || err) { + goto frees; + } + + /* Run the new folder dialog */ + do_create_folder (GTK_WINDOW (parent_window), parent_folder, NULL); + + frees: + g_object_unref (parent_folder); } static void @@ -2518,65 +2765,12 @@ modest_ui_actions_create_folder(GtkWidget *parent_window, parent_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view)); if (parent_folder) { - gboolean finished = FALSE; - gint result; - gchar *folder_name = NULL, *suggested_name = NULL; - const gchar *proto_str = NULL; - TnyAccount *account; - - if (TNY_IS_ACCOUNT (parent_folder)) - account = g_object_ref (parent_folder); - else - account = tny_folder_get_account (TNY_FOLDER (parent_folder)); - proto_str = tny_account_get_proto (TNY_ACCOUNT (account)); - - if (proto_str && modest_protocol_info_get_transport_store_protocol (proto_str) == - MODEST_PROTOCOL_STORE_POP) { - finished = TRUE; - hildon_banner_show_information (NULL, NULL, _("mail_in_ui_folder_create_error")); - } - g_object_unref (account); - - /* Run the new folder dialog */ - while (!finished) { - result = modest_platform_run_new_folder_dialog (GTK_WINDOW (parent_window), - parent_folder, - suggested_name, - &folder_name); - - g_free (suggested_name); - suggested_name = NULL; - - if (result == GTK_RESPONSE_ACCEPT) { - ModestMailOperation *mail_op; - TnyFolder *new_folder = NULL; - - mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(parent_window), - modest_ui_actions_new_folder_error_handler, - parent_window, NULL); - - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), - mail_op); - new_folder = modest_mail_operation_create_folder (mail_op, - parent_folder, - (const gchar *) folder_name); - if (new_folder) { - modest_folder_view_select_folder (MODEST_FOLDER_VIEW(folder_view), - new_folder, TRUE); - - g_object_unref (new_folder); - finished = TRUE; - } - g_object_unref (mail_op); - } else { - finished = TRUE; - } - - suggested_name = folder_name; - folder_name = NULL; - } - - g_object_unref (parent_folder); + /* The parent folder will be freed in the callback */ + modest_platform_connect_if_remote_and_perform (GTK_WINDOW (parent_window), + TRUE, + parent_folder, + create_folder_performer, + parent_folder); } } @@ -2621,6 +2815,64 @@ modest_ui_actions_rename_folder_error_handler (ModestMailOperation *mail_op, modest_platform_information_banner (GTK_WIDGET (window), NULL, message); } +typedef struct { + TnyFolderStore *folder; + gchar *new_name; +} RenameFolderInfo; + +static void +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); +} + +static void +on_rename_folder_performer (gboolean canceled, + GError *err, + GtkWindow *parent_window, + TnyAccount *account, + gpointer user_data) +{ + ModestMailOperation *mail_op = NULL; + GtkTreeSelection *sel = NULL; + GtkWidget *folder_view = NULL; + RenameFolderInfo *data = (RenameFolderInfo*)user_data; + + if (!canceled && (err == NULL) && MODEST_IS_MAIN_WINDOW(parent_window)) { + + folder_view = modest_main_window_get_child_widget ( + MODEST_MAIN_WINDOW (parent_window), + MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); + + mail_op = + modest_mail_operation_new_with_error_handling (G_OBJECT(parent_window), + modest_ui_actions_rename_folder_error_handler, + parent_window, NULL); + + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), + mail_op); + + /* Clear the headers view */ + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_view)); + gtk_tree_selection_unselect_all (sel); + + /* Actually rename the folder */ + modest_mail_operation_rename_folder (mail_op, + TNY_FOLDER (data->folder), + (const gchar *) (data->new_name), + on_rename_folder_cb, + folder_view); + } + + g_object_unref (mail_op); + g_free (data->new_name); + g_free (data); +} + void modest_ui_actions_on_rename_folder (GtkAction *action, ModestMainWindow *main_window) @@ -2652,7 +2904,7 @@ modest_ui_actions_on_rename_folder (GtkAction *action, gint response; const gchar *current_name; TnyFolderStore *parent; - gboolean do_rename = TRUE; + gboolean do_rename = TRUE; current_name = tny_folder_get_name (TNY_FOLDER (folder)); parent = tny_folder_get_folder_store (TNY_FOLDER (folder)); @@ -2661,42 +2913,14 @@ modest_ui_actions_on_rename_folder (GtkAction *action, &folder_name); g_object_unref (parent); - if (response != GTK_RESPONSE_ACCEPT || strlen (folder_name) == 0) { - do_rename = FALSE; - } else if (modest_platform_is_network_folderstore(folder) && - !tny_device_is_online (modest_runtime_get_device())) { - TnyAccount *account = tny_folder_get_account(TNY_FOLDER(folder)); - do_rename = modest_platform_connect_and_wait(GTK_WINDOW(main_window), account); - g_object_unref(account); - } - - if (do_rename) { - ModestMailOperation *mail_op; - GtkTreeSelection *sel = NULL; - - mail_op = - modest_mail_operation_new_with_error_handling (G_OBJECT(main_window), - modest_ui_actions_rename_folder_error_handler, - main_window, NULL); - - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), - mail_op); - - /* Clear the headers view */ - sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_view)); - gtk_tree_selection_unselect_all (sel); - - /* Select *after* the changes */ - modest_folder_view_select_folder (MODEST_FOLDER_VIEW(folder_view), - TNY_FOLDER(folder), TRUE); - - /* Actually rename the folder */ - modest_mail_operation_rename_folder (mail_op, - TNY_FOLDER (folder), - (const gchar *) folder_name); - - g_object_unref (mail_op); - g_free (folder_name); + if (response != GTK_RESPONSE_ACCEPT || strlen (folder_name) == 0) { + do_rename = FALSE; + } else { + RenameFolderInfo *rename_folder_data = g_new0 (RenameFolderInfo, 1); + rename_folder_data->folder = folder; + rename_folder_data->new_name = folder_name; + modest_platform_connect_if_remote_and_perform (GTK_WINDOW(main_window), TRUE, + folder, on_rename_folder_performer, rename_folder_data); } } g_object_unref (folder); @@ -2713,21 +2937,68 @@ modest_ui_actions_delete_folder_error_handler (ModestMailOperation *mail_op, g_object_unref (win); } -static gboolean -delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) +typedef struct { + TnyFolderStore *folder; + gboolean move_to_trash; +} DeleteFolderInfo; + +static void +on_delete_folder_cb (gboolean canceled, + GError *err, + GtkWindow *parent_window, + TnyAccount *account, + gpointer user_data) +{ + DeleteFolderInfo *info = (DeleteFolderInfo*) user_data; + GtkWidget *folder_view; + ModestMailOperation *mail_op; + GtkTreeSelection *sel; + + 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 ( + MODEST_MAIN_WINDOW (parent_window), + MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); + + /* Unselect the folder before deleting it to free the headers */ + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_view)); + gtk_tree_selection_unselect_all (sel); + + /* Create the mail operation */ + mail_op = + modest_mail_operation_new_with_error_handling (G_OBJECT(parent_window), + modest_ui_actions_delete_folder_error_handler, + NULL, NULL); + + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), + mail_op); + modest_mail_operation_remove_folder (mail_op, TNY_FOLDER (info->folder), info->move_to_trash); + + modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (folder_view)); + + g_object_unref (G_OBJECT (mail_op)); + g_object_unref (G_OBJECT (info->folder)); + g_free (info); +} + +static void +delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) { TnyFolderStore *folder; GtkWidget *folder_view; gint response; gchar *message; - gboolean do_delete = TRUE; - - g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (main_window), FALSE); + + g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window)); folder_view = modest_main_window_get_child_widget (main_window, MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); if (!folder_view) - return FALSE; + return; folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); @@ -2736,7 +3007,7 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) modest_platform_run_information_dialog (GTK_WINDOW (main_window), _("mail_in_ui_folder_delete_error")); g_object_unref (G_OBJECT (folder)); - return FALSE; + return; } /* Ask the user */ @@ -2746,38 +3017,20 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) (const gchar *) message); g_free (message); - if (response != GTK_RESPONSE_OK) { - do_delete = FALSE; - } else if (modest_platform_is_network_folderstore(folder) && - !tny_device_is_online (modest_runtime_get_device())) { - TnyAccount *account = tny_folder_get_account(TNY_FOLDER(folder)); - do_delete = modest_platform_connect_and_wait(GTK_WINDOW(main_window), account); - g_object_unref(account); - } - - if (do_delete) { - ModestMailOperation *mail_op; - GtkTreeSelection *sel; - - /* Unselect the folder before deleting it to free the headers */ - sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_view)); - gtk_tree_selection_unselect_all (sel); - - /* Create the mail operation */ - mail_op = - modest_mail_operation_new_with_error_handling (G_OBJECT(main_window), - modest_ui_actions_delete_folder_error_handler, - NULL, NULL); - - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), - mail_op); - modest_mail_operation_remove_folder (mail_op, TNY_FOLDER (folder), move_to_trash); - g_object_unref (G_OBJECT (mail_op)); + if (response == GTK_RESPONSE_OK) { + DeleteFolderInfo *info; + info = g_new0(DeleteFolderInfo, 1); + info->folder = folder; + info->move_to_trash = move_to_trash; + g_object_ref (G_OBJECT (info->folder)); + TnyAccount *account = tny_folder_get_account (TNY_FOLDER (folder)); + modest_platform_connect_if_remote_and_perform (GTK_WINDOW (main_window), + TRUE, + TNY_FOLDER_STORE (account), + on_delete_folder_cb, info); + g_object_unref (account); } - g_object_unref (G_OBJECT (folder)); - - return do_delete; } void @@ -2785,14 +3038,8 @@ modest_ui_actions_on_delete_folder (GtkAction *action, ModestMainWindow *main_window) { g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window)); - - if (delete_folder (main_window, FALSE)) { - GtkWidget *folder_view; - - folder_view = modest_main_window_get_child_widget (main_window, - MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); - modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (folder_view)); - } + + delete_folder (main_window, FALSE); } void @@ -2807,7 +3054,7 @@ modest_ui_actions_on_move_folder_to_trash_folder (GtkAction *action, ModestMainW static void show_error (GtkWidget *parent_widget, const gchar* text) { - hildon_banner_show_information(parent_widget, NULL, text); + modest_platform_information_banner(parent_widget, NULL, text); #if 0 GtkDialog *dialog = GTK_DIALOG (hildon_note_new_information (parent_window, text)); */ @@ -2834,7 +3081,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) @@ -2866,13 +3112,14 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store, NULL); #endif /* MODEST_PLATFORM_MAEMO */ - gtk_window_set_transient_for (GTK_WINDOW(dialog), GTK_WINDOW(main_window)); + modest_window_mgr_set_modal (modest_runtime_get_window_mgr(), GTK_WINDOW (dialog)); 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; } @@ -3025,9 +3272,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)); @@ -3067,7 +3316,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)) { @@ -3081,9 +3333,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)); @@ -3150,7 +3404,17 @@ modest_ui_actions_on_redo (GtkAction *action, static void -destroy_information_note (ModestMailOperation *mail_op, gpointer user_data) +destroy_information_note (ModestMailOperation *mail_op, + gpointer user_data) +{ + /* destroy information note */ + gtk_widget_destroy (GTK_WIDGET(user_data)); +} + +static void +destroy_folder_information_note (ModestMailOperation *mail_op, + TnyFolder *new_folder, + gpointer user_data) { /* destroy information note */ gtk_widget_destroy (GTK_WIDGET(user_data)); @@ -3295,7 +3559,7 @@ modest_ui_actions_on_paste (GtkAction *action, src_folder, folder_store, delete, - destroy_information_note, + destroy_folder_information_note, inf_note); } @@ -3393,7 +3657,7 @@ modest_ui_actions_on_change_zoom (GtkRadioAction *action, } } -void +void modest_ui_actions_msg_edit_on_change_priority (GtkRadioAction *action, GtkRadioAction *selected, ModestWindow *window) @@ -3405,7 +3669,7 @@ modest_ui_actions_msg_edit_on_change_priority (GtkRadioAction *action, modest_msg_edit_window_set_priority_flags (MODEST_MSG_EDIT_WINDOW (window), flags); } -void +void modest_ui_actions_msg_edit_on_change_file_format (GtkRadioAction *action, GtkRadioAction *selected, ModestWindow *window) @@ -3419,7 +3683,7 @@ modest_ui_actions_msg_edit_on_change_file_format (GtkRadioAction *action, } -void +void modest_ui_actions_on_zoom_plus (GtkAction *action, ModestWindow *window) { @@ -3637,21 +3901,27 @@ modest_ui_actions_msg_edit_on_select_font (GtkAction *action, modest_msg_edit_window_select_font (window); } + void 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, " "); - } + /* don't update the display name if it was already set; + * updating the display name apparently is expensive */ + const gchar* old_name = gtk_window_get_title (window); + + if (display_name == NULL) + display_name = " "; + + if (old_name && display_name && strcmp (old_name, display_name) == 0) + return; /* don't do anything */ + + /* 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. */ + gtk_window_set_title (window, display_name); + } void @@ -3698,9 +3968,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) @@ -3714,16 +3986,24 @@ 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); - - if ((gpointer) local_account != (gpointer) folder_store) { + mmc_account = modest_tny_account_store_get_mmc_folders_account (account_store); + + if ((gpointer) local_account != (gpointer) folder_store && + (gpointer) mmc_account != (gpointer) folder_store) { + const char *proto_name = tny_account_get_proto (TNY_ACCOUNT (folder_store)); + ModestTransportStoreProtocol proto = MODEST_PROTOCOL_STORE_MAILDIR; + if (proto_name != NULL) { + proto = modest_protocol_info_get_transport_store_protocol (proto_name); + } is_local_account = FALSE; /* New button should be dimmed on remote - account root */ - new_sensitive = FALSE; + POP account root */ + new_sensitive = (proto != MODEST_PROTOCOL_STORE_POP); } g_object_unref (local_account); } @@ -3774,25 +4054,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: @@ -3802,6 +4093,16 @@ on_move_to_dialog_folder_selection_changed (ModestFolderView* self, gtk_widget_set_sensitive (new_button, new_sensitive); } + +#define MODEST_MOVE_TO_DIALOG_FOLDER_VIEW "move-to-dialog-folder-view" + +static GtkWidget* +get_folder_view_from_move_to_dialog (GtkWidget *move_to_dialog) +{ + return GTK_WIDGET(g_object_get_data (G_OBJECT(move_to_dialog), + MODEST_MOVE_TO_DIALOG_FOLDER_VIEW)); +} + static GtkWidget* create_move_to_dialog (GtkWindow *win, GtkWidget *folder_view, @@ -3866,7 +4167,8 @@ create_move_to_dialog (GtkWindow *win, } else { const gchar *active_account_name = NULL; ModestAccountMgr *mgr = NULL; - ModestAccountData *acc_data = NULL; + ModestAccountSettings *settings = NULL; + ModestServerAccountSettings *store_settings = NULL; modest_folder_view_set_style (MODEST_FOLDER_VIEW (*tree_view), MODEST_FOLDER_VIEW_STYLE_SHOW_ALL); @@ -3875,19 +4177,30 @@ create_move_to_dialog (GtkWindow *win, active_account_name = modest_window_get_active_account (MODEST_WINDOW (win)); mgr = modest_runtime_get_account_mgr (); - acc_data = modest_account_mgr_get_account_data (mgr, active_account_name); + settings = modest_account_mgr_load_account_settings (mgr, active_account_name); + + if (settings) { + const gchar *store_account_name; + store_settings = modest_account_settings_get_store_settings (settings); + store_account_name = modest_server_account_settings_get_account_name (store_settings); - /* Set the new visible & active account */ - if (acc_data && acc_data->store_account) { modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW (*tree_view), - acc_data->store_account->account_name); - modest_account_mgr_free_account_data (mgr, acc_data); + store_account_name); + g_object_unref (store_settings); + g_object_unref (settings); } } + /* we keep a pointer to the embedded folder view, so we can retrieve it with + * get_folder_view_from_move_to_dialog + * (see above) later (needed for focus handling) + */ + g_object_set_data (G_OBJECT(dialog), MODEST_MOVE_TO_DIALOG_FOLDER_VIEW, *tree_view); + + /* Hide special folders */ modest_folder_view_show_non_move_folders (MODEST_FOLDER_VIEW (*tree_view), FALSE); - + gtk_container_add (GTK_CONTAINER (scroll), *tree_view); /* Add scroll to dialog */ @@ -3997,10 +4310,9 @@ modest_ui_actions_msgs_move_to_confirmation (ModestWindow *win, return response; } - - static void -move_to_cb (ModestMailOperation *mail_op, gpointer user_data) +move_to_cb (ModestMailOperation *mail_op, + gpointer user_data) { MoveToHelper *helper = (MoveToHelper *) user_data; @@ -4013,10 +4325,11 @@ move_to_cb (ModestMailOperation *mail_op, gpointer user_data) if (MODEST_IS_MSG_VIEW_WINDOW (object)) { ModestMsgViewWindow *self = MODEST_MSG_VIEW_WINDOW (object); - if (!modest_msg_view_window_select_next_message (self)) - 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)); + 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)); + } } else if (MODEST_IS_MAIN_WINDOW (object) && helper->reference != NULL) { GtkWidget *header_view; GtkTreePath *path; @@ -4039,42 +4352,59 @@ move_to_cb (ModestMailOperation *mail_op, gpointer user_data) g_free (helper); } +static void +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 +msgs_move_to_cb (ModestMailOperation *mail_op, + gpointer user_data) +{ + move_to_cb (mail_op, user_data); +} + void 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); - const GError *error = NULL; - const gchar *message = NULL; - - /* Get error message */ - error = modest_mail_operation_get_error (mail_op); - if (error != NULL && error->message != NULL) { - message = error->message; - } else { - message = _("mail_in_ui_folder_move_target_error"); - } + GObject *win = NULL; /* Disable next automatic folder selection */ main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), FALSE); /* don't create */ - if (!main_window) - g_warning ("%s: BUG: no main window", __FUNCTION__); - - 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 (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, _("mail_in_ui_folder_move_target_error")); + if (win) + g_object_unref (win); } void @@ -4103,7 +4433,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; @@ -4163,13 +4495,14 @@ open_msg_for_purge_cb (ModestMailOperation *mail_op, tny_iterator_next (iter); } + g_object_unref (iter); 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); modest_window_mgr_unregister_header (mgr, header); @@ -4182,7 +4515,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; @@ -4194,15 +4526,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); + TnyIterator *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); @@ -4237,18 +4577,19 @@ modest_ui_actions_on_main_window_remove_attachments (GtkAction *action, * and the msg view window when using the "Move to" dialog */ static void -modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder, - ModestWindow *win) +xfer_messages_from_move_to_cb (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); TnyList *headers = NULL; TnyAccount *dst_account = NULL; const gchar *proto_str = NULL; gboolean dst_is_pop = FALSE; - if (!TNY_IS_FOLDER (dst_folder)) { - modest_platform_information_banner (GTK_WIDGET (win), - NULL, - _CS("ckdg_ib_unable_to_move_to_current_location")); + if (canceled || err) { + g_object_unref (dst_folder); return; } @@ -4264,6 +4605,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), @@ -4301,11 +4647,94 @@ modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder, headers, TNY_FOLDER (dst_folder), TRUE, - move_to_cb, + msgs_move_to_cb, helper); g_object_unref (G_OBJECT (mail_op)); g_object_unref (headers); + g_object_unref (dst_folder); +} + +typedef struct { + TnyFolder *src_folder; + TnyFolderStore *dst_folder; + gboolean delete_original; + GtkWidget *folder_view; +} MoveFolderInfo; + +static void +on_move_folder_cb (gboolean canceled, GError *err, GtkWindow *parent_window, + TnyAccount *account, gpointer user_data) +{ + MoveFolderInfo *info = (MoveFolderInfo*)user_data; + GtkTreeSelection *sel; + ModestMailOperation *mail_op = NULL; + + if (canceled || err || !MODEST_IS_MAIN_WINDOW (parent_window)) { + g_object_unref (G_OBJECT (info->src_folder)); + g_object_unref (G_OBJECT (info->dst_folder)); + g_free (info); + return; + } + + MoveToHelper *helper = g_new0 (MoveToHelper, 1); + helper->banner = modest_platform_animation_banner (GTK_WIDGET (parent_window), 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 (info->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 (G_OBJECT(parent_window), + modest_ui_actions_move_folder_error_handler, + info->src_folder, NULL); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), + mail_op); + + /* Select *after* the changes */ + /* TODO: this function hangs UI after transfer */ + /* modest_folder_view_select_folder (MODEST_FOLDER_VIEW(folder_view), */ + /* TNY_FOLDER (src_folder), TRUE); */ + + modest_mail_operation_xfer_folder (mail_op, + TNY_FOLDER (info->src_folder), + info->dst_folder, + info->delete_original, + folder_move_to_cb, + helper); + + if (modest_mail_operation_get_status (mail_op) == MODEST_MAIL_OPERATION_STATUS_SUCCESS) { + modest_folder_view_select_folder (MODEST_FOLDER_VIEW(info->folder_view), + TNY_FOLDER (info->dst_folder), TRUE); + } + + /* Unref mail operation */ + g_object_unref (G_OBJECT (mail_op)); + g_object_unref (G_OBJECT (info->src_folder)); + g_object_unref (G_OBJECT (info->dst_folder)); + 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)); } /* @@ -4319,9 +4748,8 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action, ModestMainWindow *win) { ModestHeaderView *header_view = NULL; - ModestMailOperation *mail_op = NULL; TnyFolderStore *src_folder; - gboolean online = (tny_device_is_online (modest_runtime_get_device())); + gboolean online = (tny_device_is_online (modest_runtime_get_device())); g_return_if_fail (MODEST_IS_MAIN_WINDOW (win)); @@ -4333,77 +4761,80 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action, /* Get folder or messages to transfer */ if (gtk_widget_is_focus (folder_view)) { - GtkTreeSelection *sel; - gboolean do_xfer = TRUE; + gboolean do_xfer = TRUE; /* 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)) { + } 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_platform_is_network_folderstore(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); - } + do_xfer = FALSE; + } - if (do_xfer) { - 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); - - mail_op = - modest_mail_operation_new_with_error_handling (G_OBJECT(win), - modest_ui_actions_move_folder_error_handler, - src_folder, NULL); - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), - mail_op); - - /* Select *after* the changes */ - /* TODO: this function hangs UI after transfer */ -/* modest_folder_view_select_folder (MODEST_FOLDER_VIEW(folder_view), */ -/* TNY_FOLDER (src_folder), TRUE); */ - - modest_mail_operation_xfer_folder (mail_op, - TNY_FOLDER (src_folder), - dst_folder, - TRUE, - move_to_cb, - helper); - /* Unref mail operation */ - g_object_unref (G_OBJECT (mail_op)); - } + if (do_xfer) { + MoveFolderInfo *info = g_new0 (MoveFolderInfo, 1); + 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; + + 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; - /* Ask for confirmation if the source folder is remote and we're not connected */ - if (!online && modest_platform_is_network_folderstore(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); + gboolean do_xfer = TRUE; + + /* 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; + } + + /* 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); - if (!connect_to_get_msg(MODEST_WINDOW (win), num_headers, account)) - do_xfer = FALSE; + GtkResponseType response; + + 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 */ - modest_ui_actions_xfer_messages_from_move_to (dst_folder, MODEST_WINDOW (win)); + } + g_object_unref(headers); + } + if (do_xfer) /* Transfer messages */ { + DoubleConnectionInfo *connect_info = g_slice_new (DoubleConnectionInfo); + connect_info->callback = xfer_messages_from_move_to_cb; + 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); + } } - if (src_folder) - g_object_unref (src_folder); + free: + if (src_folder) + g_object_unref (src_folder); } @@ -4419,18 +4850,30 @@ modest_ui_actions_on_msg_view_window_move_to (GtkAction *action, TnyHeader *header = NULL; 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 (tny_header_get_folder(header)); g_object_unref (header); - /* Transfer the message if online or confirmed by the user */ account = tny_folder_get_account (src_folder); - if (remote_folder_is_pop(TNY_FOLDER_STORE (src_folder)) || - (modest_platform_is_network_folderstore(TNY_FOLDER_STORE (src_folder)) && - connect_to_get_msg(MODEST_WINDOW (win), 1, account))) { - modest_ui_actions_xfer_messages_from_move_to (dst_folder, MODEST_WINDOW (win)); + 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); @@ -4475,17 +4918,17 @@ modest_ui_actions_on_move_to (GtkAction *action, return; dst_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (tree_view)); - /* Do window specific stuff */ - if (MODEST_IS_MAIN_WINDOW (win)) { - modest_ui_actions_on_main_window_move_to (action, - folder_view, - dst_folder, - MODEST_MAIN_WINDOW (win)); - } else { - modest_ui_actions_on_msg_view_window_move_to (action, - dst_folder, - MODEST_MSG_VIEW_WINDOW (win)); - } + /* Do window specific stuff */ + if (MODEST_IS_MAIN_WINDOW (win)) { + modest_ui_actions_on_main_window_move_to (action, + folder_view, + dst_folder, + MODEST_MAIN_WINDOW (win)); + } else { + modest_ui_actions_on_msg_view_window_move_to (action, + dst_folder, + MODEST_MSG_VIEW_WINDOW (win)); + } if (dst_folder) g_object_unref (dst_folder); @@ -4607,28 +5050,85 @@ modest_ui_actions_on_help (GtkAction *action, 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) { + 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); + + /* 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 (G_OBJECT (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); + /* 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, TRUE, + 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 +modest_ui_actions_check_toolbar_dimming_rules (ModestWindow *window) +{ + g_return_if_fail (MODEST_IS_WINDOW (window)); + + /* Update dimmed */ + modest_window_check_dimming_rules_group (window, MODEST_DIMMING_RULES_TOOLBAR); +} + +void +modest_ui_actions_check_menu_dimming_rules (ModestWindow *window) +{ + g_return_if_fail (MODEST_IS_WINDOW (window)); + + /* Update dimmed */ + modest_window_check_dimming_rules_group (window, MODEST_DIMMING_RULES_MENU); } void @@ -4637,8 +5137,8 @@ modest_ui_actions_on_email_menu_activated (GtkAction *action, { g_return_if_fail (MODEST_IS_WINDOW (window)); - /* Update dimmed */ - modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules"); + /* Update dimmed */ + modest_ui_actions_check_menu_dimming_rules (window); } void @@ -4647,8 +5147,8 @@ modest_ui_actions_on_edit_menu_activated (GtkAction *action, { g_return_if_fail (MODEST_IS_WINDOW (window)); - /* Update dimmed */ - modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules"); + /* Update dimmed */ + modest_ui_actions_check_menu_dimming_rules (window); } void @@ -4657,8 +5157,8 @@ modest_ui_actions_on_view_menu_activated (GtkAction *action, { g_return_if_fail (MODEST_IS_WINDOW (window)); - /* Update dimmed */ - modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules"); + /* Update dimmed */ + modest_ui_actions_check_menu_dimming_rules (window); } void @@ -4667,8 +5167,8 @@ modest_ui_actions_on_format_menu_activated (GtkAction *action, { g_return_if_fail (MODEST_IS_WINDOW (window)); - /* Update dimmed */ - modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules"); + /* Update dimmed */ + modest_ui_actions_check_menu_dimming_rules (window); } void @@ -4677,8 +5177,8 @@ modest_ui_actions_on_tools_menu_activated (GtkAction *action, { g_return_if_fail (MODEST_IS_WINDOW (window)); - /* Update dimmed */ - modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules"); + /* Update dimmed */ + modest_ui_actions_check_menu_dimming_rules (window); } void @@ -4687,8 +5187,8 @@ modest_ui_actions_on_attachment_menu_activated (GtkAction *action, { g_return_if_fail (MODEST_IS_WINDOW (window)); - /* Update dimmed */ - modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules"); + /* Update dimmed */ + modest_ui_actions_check_menu_dimming_rules (window); } void @@ -4697,8 +5197,8 @@ modest_ui_actions_on_toolbar_csm_menu_activated (GtkAction *action, { g_return_if_fail (MODEST_IS_WINDOW (window)); - /* Update dimmed */ - modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules"); + /* Update dimmed */ + modest_ui_actions_check_menu_dimming_rules (window); } void @@ -4707,8 +5207,8 @@ modest_ui_actions_on_folder_view_csm_menu_activated (GtkAction *action, { g_return_if_fail (MODEST_IS_WINDOW (window)); - /* Update dimmed */ - modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules"); + /* Update dimmed */ + modest_ui_actions_check_menu_dimming_rules (window); } void @@ -4717,17 +5217,8 @@ modest_ui_actions_on_header_view_csm_menu_activated (GtkAction *action, { g_return_if_fail (MODEST_IS_WINDOW (window)); - /* Update dimmed */ - modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules"); -} - -void -modest_ui_actions_check_toolbar_dimming_rules (ModestWindow *window) -{ - g_return_if_fail (MODEST_IS_WINDOW (window)); - - /* Update dimmed */ - modest_window_check_dimming_rules_group (window, "ModestToolbarDimmingRules"); + /* Update dimmed */ + modest_ui_actions_check_menu_dimming_rules (window); } void @@ -4759,8 +5250,53 @@ static void on_send_receive_finished (ModestMailOperation *mail_op, gpointer user_data) { + GtkWidget *header_view, *folder_view; + TnyFolderStore *folder_store; + ModestMainWindow *main_win = MODEST_MAIN_WINDOW (user_data); + /* Set send/receive operation finished */ - 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) { + ModestMailOperation *refresh_op; + + 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 */ + refresh_op = modest_mail_operation_new (G_OBJECT (main_win)); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), refresh_op); + modest_mail_operation_refresh_folder (refresh_op, TNY_FOLDER (folder_store), + folder_refreshed_cb, main_win); + g_object_unref (refresh_op); + } + + if (folder_store) + g_object_unref (folder_store); } @@ -4776,7 +5312,7 @@ modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self, gchar *message = NULL; /* Don't show anything if the user cancelled something */ - if (err->code == TNY_TRANSPORT_ACCOUNT_ERROR_SEND_USER_CANCEL) + if (err->code == TNY_SYSTEM_ERROR_CANCEL) return; /* Get the server name: */ @@ -4793,20 +5329,20 @@ modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self, /* Show the appropriate message text for the GError: */ switch (err->code) { - case TNY_TRANSPORT_ACCOUNT_ERROR_SEND_HOST_LOOKUP_FAILED: + case TNY_SERVICE_ERROR_CONNECT: message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name); break; - case TNY_TRANSPORT_ACCOUNT_ERROR_SEND_SERVICE_UNAVAILABLE: - message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name); - break; - case TNY_TRANSPORT_ACCOUNT_ERROR_SEND_AUTHENTICATION_NOT_SUPPORTED: + case TNY_SERVICE_ERROR_AUTHENTICATE: message = g_strdup_printf (_("emev_ni_ui_smtp_authentication_fail_error"), server_name); break; - case TNY_TRANSPORT_ACCOUNT_ERROR_SEND: + case TNY_SERVICE_ERROR_SEND: message = g_strdup (_("emev_ib_ui_smtp_send_error")); break; default: - g_return_if_reached (); + g_warning ("%s: unexpected ERROR %d", + __FUNCTION__, err->code); + message = g_strdup (_("emev_ib_ui_smtp_send_error")); + break; } /* TODO if the username or the password where not defined we @@ -4858,9 +5394,98 @@ modest_ui_actions_on_send_queue_status_changed (ModestTnySendQueue *send_queue, #else gtk_widget_queue_draw (header_view); #endif + + /* Rerun dimming rules, because the message could become deletable for example */ + modest_window_check_dimming_rules_group (MODEST_WINDOW (main_window), + MODEST_DIMMING_RULES_TOOLBAR); /* Free */ frees: 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); + } +} + +gchar * +modest_ui_actions_get_msg_already_deleted_error_msg (ModestWindow *win) +{ + gchar *msg = NULL; + TnyFolderStore *folder = NULL; + TnyAccount *account = NULL; + ModestTransportStoreProtocol proto; + TnyHeader *header = NULL; + + if (MODEST_IS_MAIN_WINDOW (win)) { + GtkWidget *header_view; + TnyList* headers = NULL; + TnyIterator *iter; + header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win), + MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); + headers = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (header_view)); + if (!headers || tny_list_get_length (headers) == 0) { + if (headers) + g_object_unref (headers); + return NULL; + } + iter = tny_list_create_iterator (headers); + header = TNY_HEADER (tny_iterator_get_current (iter)); + folder = TNY_FOLDER_STORE (tny_header_get_folder (header)); + g_object_unref (iter); + g_object_unref (headers); + } else if (MODEST_IS_MSG_VIEW_WINDOW (win)) { + header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win)); + folder = TNY_FOLDER_STORE (tny_header_get_folder (header)); + } + + /* Get the account type */ + account = tny_folder_get_account (TNY_FOLDER (folder)); + proto = modest_protocol_info_get_transport_store_protocol (tny_account_get_proto (account)); + if (proto == MODEST_PROTOCOL_STORE_POP) { + msg = g_strdup (_("emev_ni_ui_pop3_msg_recv_error")); + } else if (proto == MODEST_PROTOCOL_STORE_IMAP) { + msg = g_strdup_printf (_("emev_ni_ui_imap_message_not_available_in_server"), + tny_header_get_subject (header)); + } else { + msg = g_strdup_printf (_("mail_ni_ui_folder_get_msg_folder_error")); + } + + /* Frees */ + g_object_unref (account); + g_object_unref (folder); + g_object_unref (header); + + return msg; +}