X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=3780e5baa6dcba3f50e80cc6f5eb856ef9a99bf6;hp=be1d2a0ce1c6d2dc02215ccaa0959eb0423ce436;hb=391b0d19bd75e39f1dd12807a7d0ae1289d06f52;hpb=a9eaeebe014fc78e453b46935cf8cd4c80dd4273 diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index be1d2a0..3780e5b 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -45,9 +45,14 @@ #include "modest-tny-platform-factory.h" #include "modest-platform.h" #include +#include +#include +#include #ifdef MODEST_PLATFORM_MAEMO #include "maemo/modest-osso-state-saving.h" +#include "maemo/modest-maemo-utils.h" +#include "maemo/modest-hildon-includes.h" #endif /* MODEST_PLATFORM_MAEMO */ #include "widgets/modest-ui-constants.h" @@ -98,6 +103,11 @@ typedef struct _ReplyForwardHelper { GtkWidget *parent_window; } ReplyForwardHelper; +typedef struct _PasteAsAttachmentHelper { + ModestMsgEditWindow *window; + GtkWidget *banner; +} PasteAsAttachmentHelper; + /* * The do_headers_action uses this kind of functions to perform some @@ -129,19 +139,73 @@ static void _on_send_receive_progress_changed (ModestMailOperation *mail_op ModestMailOperationState *state, gpointer user_data); +static gint header_list_count_uncached_msgs ( + TnyList *header_list, + GtkWindow *win); +static gboolean connect_to_get_msg ( + GtkWindow *win, + gint num_of_uncached_msgs); -static void -run_account_setup_wizard (ModestWindow *win) + +/* Show the account creation wizard dialog. + * returns: TRUE if an account was created. FALSE if the user cancelled. + */ +gboolean +modest_run_account_setup_wizard (ModestWindow *win) { - ModestEasysetupWizardDialog *wizard; + gboolean result = FALSE; + GtkDialog *wizard; + + wizard = modest_window_mgr_get_easysetup_dialog + (modest_runtime_get_window_mgr()); + if (wizard) { + /* old wizard is active already; present it and + * act as if the user cancelled the non-existing + * new one + */ + printf ("wizard already active\n"); + return FALSE; + } else { + /* there is no such wizard yet */ + wizard = GTK_DIALOG(modest_easysetup_wizard_dialog_new ()); + modest_window_mgr_set_easysetup_dialog + (modest_runtime_get_window_mgr(), GTK_DIALOG(wizard)); + } + + + /* always present a main window in the background + * we do it here, so we cannot end up with to wizards (as this + * function might be called in modest_window_mgr_get_main_window as well */ + if (!win) + win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr()); + + /* make sure the mainwindow is visible */ + gtk_widget_show_all (GTK_WIDGET(win)); + gtk_window_present (GTK_WINDOW(win)); - g_return_if_fail (MODEST_IS_WINDOW(win)); - wizard = modest_easysetup_wizard_dialog_new (); gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (win)); - gtk_dialog_run (GTK_DIALOG (wizard)); + + /* Don't make this a modal window, because secondary windows will then + * be unusable, freezing the UI: */ + /* gtk_window_set_modal (GTK_WINDOW (wizard), TRUE); */ + + gint dialog_response = gtk_dialog_run (GTK_DIALOG (wizard)); + if (dialog_response == GTK_RESPONSE_CANCEL) + result = FALSE; + else { + /* Check whether an account was created: */ + result = modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE); + } + gtk_widget_destroy (GTK_WIDGET (wizard)); + + /* clear it from the window mgr */ + modest_window_mgr_set_easysetup_dialog + (modest_runtime_get_window_mgr(), NULL); + + return result; } @@ -166,6 +230,8 @@ modest_ui_actions_on_about (GtkAction *action, ModestWindow *win) "uses the tinymail email framework written by Philip van Hoof")); gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG(about), authors); gtk_about_dialog_set_website (GTK_ABOUT_DIALOG(about), "http://modest.garage.maemo.org"); + gtk_window_set_transient_for (GTK_WINDOW (about), GTK_WINDOW (win)); + gtk_window_set_modal (GTK_WINDOW (about), TRUE); gtk_dialog_run (GTK_DIALOG (about)); gtk_widget_destroy(about); @@ -236,25 +302,64 @@ headers_action_mark_as_unread (TnyHeader *header, } } - -static void -headers_action_delete (TnyHeader *header, - ModestWindow *win, - gpointer user_data) +/** A convenience method, because deleting a message is + * otherwise complicated, and it's best to change it in one place + * when we change it. + */ +void modest_do_message_delete (TnyHeader *header, ModestWindow *win) { ModestMailOperation *mail_op = NULL; - - mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_DELETE, G_OBJECT(win)); + mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_DELETE, + win ? G_OBJECT(win) : NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); /* Always delete. TODO: Move to trash still not supported */ modest_mail_operation_remove_msg (mail_op, header, FALSE); g_object_unref (G_OBJECT (mail_op)); +} + +/** A convenience method, because deleting a message is + * otherwise complicated, and it's best to change it in one place + * when we change it. + */ +void modest_do_messages_delete (TnyList *headers, ModestWindow *win) +{ + ModestMailOperation *mail_op = NULL; + mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_DELETE, + win ? G_OBJECT(win) : NULL); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), + mail_op); + + /* Always delete. TODO: Move to trash still not supported */ + modest_mail_operation_remove_msgs (mail_op, headers, FALSE); + g_object_unref (G_OBJECT (mail_op)); +} + +/* static void */ +/* headers_action_delete (TnyHeader *header, */ +/* ModestWindow *win, */ +/* gpointer user_data) */ +/* { */ +/* modest_do_message_delete (header, win); */ + +/* } */ - /* refilter treemodel to hide marked-as-deleted rows */ - if (MODEST_IS_HEADER_VIEW (user_data)) - modest_header_view_refilter (MODEST_HEADER_VIEW (user_data)); +/** 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. + **/ +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)) { + gboolean ret_value; + g_signal_emit_by_name (G_OBJECT (win), "delete-event", NULL, &ret_value); + } + } } void @@ -280,10 +385,12 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) return; } + /* Get the headers, either from the header view (if win is the main window), + * or from the message view window: */ header_list = get_selected_headers (win); if (!header_list) return; - - /* Check if any of the headers is already opened, or in the process of being opened */ + + /* Check if any of the headers are already opened, or in the process of being opened */ if (MODEST_IS_MAIN_WINDOW (win)) { gboolean found; iter = tny_list_create_iterator (header_list); @@ -291,8 +398,11 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) mgr = modest_runtime_get_window_mgr (); while (!tny_iterator_is_done (iter) && !found) { header = TNY_HEADER (tny_iterator_get_current (iter)); - found = modest_window_mgr_find_registered_header (mgr, header, NULL); - g_object_unref (header); + if (header) { + found = modest_window_mgr_find_registered_header (mgr, header, NULL); + g_object_unref (header); + } + tny_iterator_next (iter); } g_object_unref (iter); @@ -316,51 +426,97 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) if (tny_list_get_length(header_list) == 1) { iter = tny_list_create_iterator (header_list); header = TNY_HEADER (tny_iterator_get_current (iter)); - desc = g_strdup_printf ("%s", tny_header_get_subject (header)); - g_object_unref (header); + if (header) { + desc = g_strdup_printf ("%s", tny_header_get_subject (header)); + g_object_unref (header); + } + g_object_unref (iter); } message = g_strdup_printf(ngettext("emev_nc_delete_message", "emev_nc_delete_messages", tny_list_get_length(header_list)), desc); - /* Confirmation dialog */ + /* Confirmation dialog */ response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win), message); if (response == GTK_RESPONSE_OK) { - ModestMainWindow *main_window; - ModestWindowMgr *mgr; + ModestWindow *main_window = NULL; + ModestWindowMgr *mgr = NULL; + GtkTreeModel *model = NULL; + GtkTreeSelection *sel = NULL; + GList *sel_list = NULL, *tmp = NULL; + GtkTreeRowReference *row_reference = NULL; + GtkTreePath *next_path = NULL; + GError *err = NULL; + + /* Find last selected row */ + if (MODEST_IS_MAIN_WINDOW (win)) { + model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)); + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (header_view)); + sel_list = gtk_tree_selection_get_selected_rows (sel, &model); + for (tmp=sel_list; tmp; tmp=tmp->next) { + if (tmp->next == NULL) { + next_path = gtk_tree_path_copy((GtkTreePath *) tmp->data); + gtk_tree_path_next (next_path); + row_reference = gtk_tree_row_reference_new (model, next_path); + gtk_tree_path_free (next_path); + } + } + } + + /* Disable window dimming management */ + modest_window_disable_dimming (MODEST_WINDOW(win)); /* Remove each header. If it's a view window header_view == NULL */ - do_headers_action (win, headers_action_delete, header_view); +/* do_headers_action (win, headers_action_delete, header_view); */ + modest_do_messages_delete (header_list, win); + + + /* Enable window dimming management */ + gtk_tree_selection_unselect_all (sel); + modest_window_enable_dimming (MODEST_WINDOW(win)); + /* FIXME: May be folder_monitor will also refilter treemode on EXPUNGE changes ? */ + /* refresh the header view (removing marked-as-deleted) */ +/* modest_header_view_refilter (MODEST_HEADER_VIEW(header_view)); */ + if (MODEST_IS_MSG_VIEW_WINDOW (win)) { - /* Close msg view window or select next */ - if (modest_msg_view_window_last_message_selected (MODEST_MSG_VIEW_WINDOW (win)) && - modest_msg_view_window_first_message_selected (MODEST_MSG_VIEW_WINDOW (win))) { - modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (win)); - } else { - modest_msg_view_window_select_next_message (MODEST_MSG_VIEW_WINDOW (win)); + modest_ui_actions_refresh_message_window_after_delete (MODEST_MSG_VIEW_WINDOW (win)); + + /* Get main window */ + mgr = modest_runtime_get_window_mgr (); + main_window = modest_window_mgr_get_main_window (mgr); + } + else { + /* Move cursor to next row */ + main_window = win; + + /* Select next row */ + if (gtk_tree_row_reference_valid (row_reference)) { + next_path = gtk_tree_row_reference_get_path (row_reference); + gtk_tree_selection_select_path (sel, next_path); + gtk_tree_path_free (next_path); } + if (row_reference != NULL) + gtk_tree_row_reference_free (row_reference); } - /* Refilter header view model, if main window still exists */ - mgr = modest_runtime_get_window_mgr (); - main_window = MODEST_MAIN_WINDOW (modest_window_mgr_get_main_window (mgr)); - if (main_window) { - GtkWidget *widget; - - widget = modest_main_window_get_child_widget (main_window, - MODEST_WIDGET_TYPE_HEADER_VIEW); - modest_header_view_refilter (MODEST_HEADER_VIEW (widget)); - - /* Update toolbar dimming state */ - modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window)); + 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)); + + /* Free */ + g_list_foreach (sel_list, (GFunc) gtk_tree_path_free, NULL); + g_list_free (sel_list); } - /* free */ + /* Free*/ g_free(message); g_free(desc); g_object_unref (header_list); @@ -369,7 +525,7 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) -/* delete either message or folder, based on what has focus */ +/* delete either message or folder, based on where we are */ void modest_ui_actions_on_delete_message_or_folder (GtkAction *action, ModestWindow *win) { @@ -378,14 +534,6 @@ modest_ui_actions_on_delete_message_or_folder (GtkAction *action, ModestWindow * /* Check first if the header view has the focus */ if (MODEST_IS_MAIN_WINDOW (win)) { GtkWidget *w; - - w = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), - MODEST_WIDGET_TYPE_HEADER_VIEW); - if (gtk_widget_is_focus (w)) { - modest_ui_actions_on_delete_message (action, win); - return; - } - w = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), MODEST_WIDGET_TYPE_FOLDER_VIEW); if (gtk_widget_is_focus (w)) { @@ -393,8 +541,7 @@ modest_ui_actions_on_delete_message_or_folder (GtkAction *action, ModestWindow * return; } } - g_warning ("BUG: delete toolbar button pressed with neither headerview nor folderview " - "having focus"); + modest_ui_actions_on_delete_message (action, win); } @@ -427,6 +574,7 @@ void modest_ui_actions_on_close_window (GtkAction *action, ModestWindow *win) { gboolean ret_value; + g_signal_emit_by_name (G_OBJECT (win), "delete-event", NULL, &ret_value); /* if (MODEST_IS_MSG_VIEW_WINDOW (win)) { */ @@ -466,14 +614,17 @@ 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)) { - run_account_setup_wizard (win); + modest_run_account_setup_wizard (win); return; } else { /* Show the list of accounts: */ GtkDialog *account_win = GTK_DIALOG(modest_account_view_window_new ()); - gtk_window_set_transient_for (GTK_WINDOW (account_win), GTK_WINDOW(win)); - gtk_dialog_run (account_win); - gtk_widget_destroy (GTK_WIDGET(account_win)); + gtk_window_set_transient_for (GTK_WINDOW (account_win), GTK_WINDOW (win)); + + /* Don't make this a modal window, because secondary windows will then + * be unusable, freezing the UI: */ + /* gtk_window_set_modal (GTK_WINDOW (account_win), TRUE); */ + modest_maemo_show_dialog_and_forget (GTK_WINDOW (win), account_win); } #else GtkWidget *dialog, *label; @@ -569,8 +720,9 @@ 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)) { - run_account_setup_wizard (win); - return; + const gboolean created = modest_run_account_setup_wizard (win); + if (!created) + return; } account_name = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr ()); @@ -595,16 +747,17 @@ modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win) goto cleanup; } - if (modest_account_mgr_get_bool (modest_runtime_get_account_mgr (), account_name, - MODEST_ACCOUNT_USE_SIGNATURE, FALSE)) { - signature = modest_account_mgr_get_string (modest_runtime_get_account_mgr (), account_name, - MODEST_ACCOUNT_SIGNATURE, FALSE); + gboolean use_signature = FALSE; + signature = modest_account_mgr_get_signature (modest_runtime_get_account_mgr (), account_name, &use_signature); + + if (use_signature) { blank_and_signature = g_strconcat ("\n", signature, NULL); - g_free (signature); } else { blank_and_signature = g_strdup (""); } + g_free (signature); + msg = modest_tny_msg_new ("", from_str, "", "", "", blank_and_signature, NULL); if (!msg) { g_printerr ("modest: failed to create new msg\n"); @@ -619,8 +772,8 @@ modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win) /* Create and register edit window */ - /* This is destroyed by TOOD. */ - msg_win = modest_msg_edit_window_new (msg, account_name); + /* This is destroyed by TODO. */ + msg_win = modest_msg_edit_window_new (msg, account_name, FALSE); mgr = modest_runtime_get_window_mgr (); modest_window_mgr_register_window (mgr, msg_win); @@ -681,8 +834,6 @@ open_msg_cb (ModestMailOperation *mail_op, operation. The error will be shown by the error_handler of the mail operation */ if (!modest_ui_actions_msg_retrieval_check (mail_op, header, msg)) { - printf ("DEBUG: %s: modest_ui_actions_msg_retrieval_check() failed.\n", - __FUNCTION__); return; } @@ -693,23 +844,26 @@ open_msg_cb (ModestMailOperation *mail_op, headers_action_mark_as_read (header, MODEST_WINDOW(parent_win), NULL); /* Get account */ - account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr()); + account = g_strdup (modest_window_get_active_account (MODEST_WINDOW (parent_win))); if (!account) - account = g_strdup (modest_window_get_active_account (MODEST_WINDOW (parent_win))); + account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr()); /* Gets folder type (OUTBOX headers will be opened in edit window */ if (modest_tny_folder_is_local_folder (folder)) - folder_type = modest_tny_folder_get_local_folder_type (folder); + folder_type = modest_tny_folder_get_local_or_mmc_folder_type (folder); /* If the header is in the drafts folder then open the editor, else the message view window */ - if (folder_type == TNY_FOLDER_TYPE_DRAFTS) { + if ((folder_type == TNY_FOLDER_TYPE_DRAFTS) || + (folder_type == TNY_FOLDER_TYPE_OUTBOX)) { /* we cannot edit without a valid account... */ if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE)) { - run_account_setup_wizard(parent_win); - goto cleanup; + const gboolean created = modest_run_account_setup_wizard(parent_win); + if (!created) + goto cleanup; } - win = modest_msg_edit_window_new (msg, account); + win = modest_msg_edit_window_new (msg, account, TRUE); + } else { gchar *uid = modest_tny_folder_get_header_unique_id (header); @@ -732,17 +886,15 @@ open_msg_cb (ModestMailOperation *mail_op, g_list_foreach (sel_list, (GFunc) gtk_tree_path_free, NULL); g_list_free (sel_list); - win = modest_msg_view_window_new_with_header_model (msg, - account, - (const gchar*) uid, - model, - row_reference); + win = modest_msg_view_window_new_with_header_model ( + msg, account, (const gchar*) uid, + model, row_reference); gtk_tree_row_reference_free (row_reference); } else { - win = modest_msg_view_window_new (msg, account, (const gchar*) uid); + win = modest_msg_view_window_new_for_attachment (msg, account, (const gchar*) uid); } } else { - win = modest_msg_view_window_new (msg, account, (const gchar*) uid); + win = modest_msg_view_window_new_for_attachment (msg, account, (const gchar*) uid); } g_free (uid); } @@ -765,7 +917,6 @@ cleanup: /* Free */ g_free(account); g_object_unref (parent_win); -/* g_object_unref (msg); */ g_object_unref (folder); } @@ -802,27 +953,36 @@ _modest_ui_actions_open (TnyList *headers, ModestWindow *win) { ModestWindowMgr *mgr = NULL; TnyIterator *iter = NULL; - ModestMailOperation *mail_op1 = NULL; - ModestMailOperation *mail_op2 = NULL; + ModestMailOperation *mail_op = NULL; TnyList *not_opened_headers = NULL; - TnyList *not_opened_cached_headers = NULL; - TnyHeaderFlags flags; + TnyHeaderFlags flags = 0; + g_return_if_fail (headers != NULL); + + /* Check that only one message is selected for opening */ + if (tny_list_get_length (headers) != 1) { + modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL, + _("mcen_ib_select_one_message")); + return; + } + + /* Look if we already have a message view for each header. If true, then remove the header from the list of headers to open */ mgr = modest_runtime_get_window_mgr (); iter = tny_list_create_iterator (headers); not_opened_headers = tny_simple_list_new (); - not_opened_cached_headers = tny_simple_list_new (); + while (!tny_iterator_is_done (iter)) { - ModestWindow *window; - TnyHeader *header; - gboolean found; + ModestWindow *window = NULL; + TnyHeader *header = NULL; + gboolean found = FALSE; header = TNY_HEADER (tny_iterator_get_current (iter)); - flags = tny_header_get_flags (header); + if (header) + flags = tny_header_get_flags (header); window = NULL; found = modest_window_mgr_find_registered_header (mgr, header, &window); @@ -835,16 +995,14 @@ _modest_ui_actions_open (TnyList *headers, ModestWindow *win) else /* the header has been registered already, we don't do * anything but wait for the window to come up*/ - g_warning ("debug: header %p already registered, waiting for window", - header); + g_debug ("header %p already registered, waiting for window", header); } else { - if (!(flags & TNY_HEADER_FLAG_CACHED)) - tny_list_append (not_opened_headers, G_OBJECT (header)); - /* Check if msg has already been retreived */ - else - tny_list_append (not_opened_cached_headers, G_OBJECT (header)); + tny_list_append (not_opened_headers, G_OBJECT (header)); } - g_object_unref (header); + + if (header) + g_object_unref (header); + tny_iterator_next (iter); } g_object_unref (iter); @@ -854,14 +1012,25 @@ _modest_ui_actions_open (TnyList *headers, ModestWindow *win) * make a connection. It's generally easier to do this here (in the mainloop) * than later in a thread: */ - if (tny_list_get_length (not_opened_cached_headers) > 0) { - gboolean connected = modest_platform_connect_and_wait (GTK_WINDOW (win)); - - /* Don't go further if a connection would be necessary but none is available: */ - if (!connected) { + if (tny_list_get_length (not_opened_headers) > 0) { + TnyIterator *iter; + gboolean found = FALSE; + + iter = tny_list_create_iterator (not_opened_headers); + while (!tny_iterator_is_done (iter) && !found) { + TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter)); + if (!(tny_header_get_flags (header) & TNY_HEADER_FLAG_CACHED)) + found = TRUE; + else + tny_iterator_next (iter); + + g_object_unref (header); + } + g_object_unref (iter); + + if (found && !modest_platform_connect_and_wait (GTK_WINDOW (win), NULL)) { g_object_unref (not_opened_headers); - g_object_unref (not_opened_cached_headers); - return; + return; } } @@ -869,35 +1038,25 @@ _modest_ui_actions_open (TnyList *headers, ModestWindow *win) TnyIterator *iter_not_opened = tny_list_create_iterator (not_opened_headers); while (!tny_iterator_is_done (iter_not_opened)) { TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter_not_opened)); - modest_window_mgr_register_header (mgr, header); - g_object_unref (header); + if (header) { + modest_window_mgr_register_header (mgr, header); + g_object_unref (header); + } tny_iterator_next (iter_not_opened); } g_object_unref (iter_not_opened); iter_not_opened = NULL; - TnyIterator *iter_cached = tny_list_create_iterator (not_opened_cached_headers); - while (!tny_iterator_is_done (iter_cached)) { - TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter_cached)); - modest_window_mgr_register_header (mgr, header); - g_object_unref (header); - - tny_iterator_next (iter_cached); - } - g_object_unref (iter_cached); - iter_cached = NULL; - - - /* Open each uncached message */ + /* Open each message */ if (tny_list_get_length (not_opened_headers) > 0) { - mail_op1 = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, + mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT (win), modest_ui_actions_get_msgs_full_error_handler, NULL); - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op1); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); if (tny_list_get_length (not_opened_headers) > 1) { - modest_mail_operation_get_msgs_full (mail_op1, + modest_mail_operation_get_msgs_full (mail_op, not_opened_headers, open_msg_cb, NULL, @@ -905,45 +1064,16 @@ _modest_ui_actions_open (TnyList *headers, ModestWindow *win) } else { TnyIterator *iter = tny_list_create_iterator (not_opened_headers); TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter)); - modest_mail_operation_get_msg (mail_op1, header, open_msg_cb, NULL); - g_object_unref (header); - g_object_unref (iter); - } - } - - /* Open each cached message */ - if (tny_list_get_length (not_opened_cached_headers) > 0) { - mail_op2 = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, - G_OBJECT (win), - modest_ui_actions_get_msgs_full_error_handler, - NULL); - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op2); - if (tny_list_get_length (not_opened_cached_headers) > 1) { - modest_mail_operation_get_msgs_full (mail_op2, - not_opened_headers, - open_msg_cb, - NULL, - NULL); - } else { - TnyIterator *iter = tny_list_create_iterator (not_opened_cached_headers); - TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter)); - modest_mail_operation_get_msg (mail_op2, header, open_msg_cb, NULL); + modest_mail_operation_get_msg (mail_op, header, open_msg_cb, NULL); g_object_unref (header); g_object_unref (iter); } + g_object_unref (mail_op); } /* Clean */ if (not_opened_headers != NULL) g_object_unref (not_opened_headers); - if (not_opened_cached_headers != NULL) - g_object_unref (not_opened_cached_headers); - if (iter != NULL) - g_object_unref (iter); - if (mail_op1 != NULL) - g_object_unref (mail_op1); - if (mail_op2 != NULL) - g_object_unref (mail_op2); } void @@ -988,8 +1118,10 @@ reply_forward_cb (ModestMailOperation *mail_op, ModestWindowMgr *mgr = NULL; gchar *signature = NULL; - /* If there was any error */ - if (!modest_ui_actions_msg_retrieval_check (mail_op, header, msg)) + /* If there was any error. The mail operation could be NULL, + this means that we already have the message downloaded and + that we didn't do a mail operation to retrieve it */ + if (mail_op && !modest_ui_actions_msg_retrieval_check (mail_op, header, msg)) return; g_return_if_fail (user_data != NULL); @@ -1009,13 +1141,13 @@ reply_forward_cb (ModestMailOperation *mail_op, switch (rf_helper->action) { case ACTION_REPLY: new_msg = - modest_tny_msg_create_reply_msg (msg, from, signature, + modest_tny_msg_create_reply_msg (msg, header, from, signature, 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, from, signature, rf_helper->reply_forward_type, + modest_tny_msg_create_reply_msg (msg, header, from, signature, rf_helper->reply_forward_type, MODEST_TNY_MSG_REPLY_MODE_ALL); edit_type = MODEST_EDIT_TYPE_REPLY; break; @@ -1045,7 +1177,7 @@ reply_forward_cb (ModestMailOperation *mail_op, } /* Create and register the windows */ - msg_win = modest_msg_edit_window_new (new_msg, rf_helper->account_name); + msg_win = modest_msg_edit_window_new (new_msg, rf_helper->account_name, FALSE); mgr = modest_runtime_get_window_mgr (); modest_window_mgr_register_window (mgr, msg_win); @@ -1067,62 +1199,60 @@ cleanup: if (account) g_object_unref (G_OBJECT (account)); /* g_object_unref (msg); */ - g_object_unref (header); free_reply_forward_helper (rf_helper); } -/* - * Checks a list of headers. If any of them are not currently - * downloaded (CACHED) then it asks the user for permission to - * download them. - * - * Returns FALSE if the user does not want to download the - * messages. Returns TRUE if the user allowed the download or if all - * of them are currently downloaded +/* Checks a list of headers. If any of them are not currently + * downloaded (CACHED) then returns TRUE else returns FALSE. */ -static gboolean -download_uncached_messages (TnyList *header_list, GtkWindow *win) +static gint +header_list_count_uncached_msgs ( + TnyList *header_list, + GtkWindow *win) { TnyIterator *iter; - gboolean retval; gint uncached_messages = 0; iter = tny_list_create_iterator (header_list); while (!tny_iterator_is_done (iter)) { TnyHeader *header; - TnyHeaderFlags flags; header = TNY_HEADER (tny_iterator_get_current (iter)); - flags = tny_header_get_flags (header); - /* TODO: is this the right flag?, it seems that some - headers that have been previously downloaded do not - come with it */ - if (! (flags & TNY_HEADER_FLAG_CACHED)) - uncached_messages ++; - g_object_unref (header); + if (header) { + if (!(tny_header_get_flags (header) & TNY_HEADER_FLAG_CACHED)) + uncached_messages ++; + g_object_unref (header); + } + tny_iterator_next (iter); } g_object_unref (iter); - /* Ask for user permission to download the messages */ - retval = TRUE; - if (uncached_messages > 0) { - GtkResponseType response; - response = - modest_platform_run_confirmation_dialog (GTK_WINDOW (win), - ngettext("mcen_nc_get_msg", - "mcen_nc_get_msgs", - uncached_messages)); - if (response == GTK_RESPONSE_CANCEL) - retval = FALSE; - else { - /* If a download will be necessary, make sure that we have a connection: */ - retval = modest_platform_connect_and_wait(win); - } - } - return retval; + return uncached_messages; } +/* Returns FALSE if the user does not want to download the + * messages. Returns TRUE if the user allowed the download. + */ +static gboolean +connect_to_get_msg (GtkWindow *win, + gint num_of_uncached_msgs) +{ + /* Allways download if we are online. */ + if (tny_device_is_online (modest_runtime_get_device ())) + return TRUE; + + /* If offline, then ask for user permission to download the messages */ + GtkResponseType response; + response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win), + ngettext("mcen_nc_get_msg", + "mcen_nc_get_msgs", + num_of_uncached_msgs)); + if (response == GTK_RESPONSE_CANCEL) + return FALSE; + + return modest_platform_connect_and_wait(win, NULL); +} /* * Common code for the reply and forward actions @@ -1134,31 +1264,50 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) TnyList *header_list = NULL; ReplyForwardHelper *rf_helper = NULL; guint reply_forward_type; - gboolean continue_download; + gboolean continue_download = TRUE; + gboolean do_retrieve = TRUE; g_return_if_fail (MODEST_IS_WINDOW(win)); /* we need an account when editing */ if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE)) { - run_account_setup_wizard (win); - return; + const gboolean created = modest_run_account_setup_wizard (win); + if (!created) + return; } header_list = get_selected_headers (win); if (!header_list) return; - /* Check that the messages have been previously downloaded */ - continue_download = download_uncached_messages (header_list, GTK_WINDOW (win)); + reply_forward_type = + modest_conf_get_int (modest_runtime_get_conf (), + (action == ACTION_FORWARD) ? MODEST_CONF_FORWARD_TYPE : MODEST_CONF_REPLY_TYPE, + NULL); + + /* check if we need to download msg before asking about it */ + do_retrieve = (action == ACTION_FORWARD) || + (reply_forward_type != MODEST_TNY_MSG_REPLY_TYPE_CITE); + + if (do_retrieve){ + gint num_of_unc_msgs; + /* check that the messages have been previously downloaded */ + num_of_unc_msgs = header_list_count_uncached_msgs( + header_list, + GTK_WINDOW (win)); + /* If there are any uncached message ask the user + * whether he/she wants to download them. */ + if (num_of_unc_msgs) + continue_download = connect_to_get_msg ( + GTK_WINDOW (win), + num_of_unc_msgs); + } + if (!continue_download) { g_object_unref (header_list); return; } - reply_forward_type = - modest_conf_get_int (modest_runtime_get_conf (), - (action == ACTION_FORWARD) ? MODEST_CONF_FORWARD_TYPE : MODEST_CONF_REPLY_TYPE, - NULL); /* We assume that we can only select messages of the same folder and that we reply all of them from the same account. In fact the interface currently only @@ -1169,6 +1318,7 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) rf_helper->reply_forward_type = reply_forward_type; rf_helper->action = action; rf_helper->account_name = g_strdup (modest_window_get_active_account (win)); + if ((win != NULL) && (MODEST_IS_WINDOW (win))) rf_helper->parent_window = GTK_WIDGET (win); if (!rf_helper->account_name) @@ -1185,42 +1335,49 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) if (!msg || !header) { if (msg) g_object_unref (msg); - if (header) - g_object_unref (header); g_printerr ("modest: no message found\n"); return; } else { reply_forward_cb (NULL, header, msg, rf_helper); } + if (header) + g_object_unref (header); } else { TnyHeader *header; TnyIterator *iter; - /* Retrieve messages */ - mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, - G_OBJECT(win), - modest_ui_actions_get_msgs_full_error_handler, - NULL); - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); - /* Only reply/forward to one message */ iter = tny_list_create_iterator (header_list); header = TNY_HEADER (tny_iterator_get_current (iter)); g_object_unref (iter); - modest_mail_operation_get_msg (mail_op, - header, - reply_forward_cb, - rf_helper); + if (header) { + /* Retrieve messages */ + if (do_retrieve) { + mail_op = modest_mail_operation_new_with_error_handling ( + MODEST_MAIL_OPERATION_TYPE_RECEIVE, + G_OBJECT(win), + modest_ui_actions_get_msgs_full_error_handler, + NULL); + modest_mail_operation_queue_add ( + modest_runtime_get_mail_operation_queue (), mail_op); + + modest_mail_operation_get_msg (mail_op, + header, + reply_forward_cb, + rf_helper); + /* Clean */ + g_object_unref(mail_op); + } 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); + } + -/* modest_mail_operation_get_msgs_full (mail_op, */ -/* header_list, */ -/* reply_forward_cb, */ -/* rf_helper, */ -/* free_reply_forward_helper); */ + g_object_unref (header); + } - /* Clean */ - g_object_unref(mail_op); } /* Free */ @@ -1258,14 +1415,17 @@ modest_ui_actions_on_next (GtkAction *action, if (MODEST_IS_MAIN_WINDOW (window)) { GtkWidget *header_view; - header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(window), - MODEST_WIDGET_TYPE_HEADER_VIEW); + header_view = modest_main_window_get_child_widget ( + MODEST_MAIN_WINDOW(window), + MODEST_WIDGET_TYPE_HEADER_VIEW); if (!header_view) return; - modest_header_view_select_next (MODEST_HEADER_VIEW(header_view)); + modest_header_view_select_next ( + MODEST_HEADER_VIEW(header_view)); } else if (MODEST_IS_MSG_VIEW_WINDOW (window)) { - modest_msg_view_window_select_next_message (MODEST_MSG_VIEW_WINDOW (window)); + modest_msg_view_window_select_next_message ( + MODEST_MSG_VIEW_WINDOW (window)); } else { g_return_if_reached (); } @@ -1302,8 +1462,11 @@ modest_ui_actions_on_sort (GtkAction *action, GtkWidget *header_view; header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(window), MODEST_WIDGET_TYPE_HEADER_VIEW); - if (!header_view) + if (!header_view) { + modest_platform_information_banner (NULL, NULL, _CS("ckdg_ib_nothing_to_sort")); + return; + } /* Show sorting dialog */ modest_platform_run_sort_dialog (GTK_WINDOW (window), MODEST_SORT_HEADERS); @@ -1315,10 +1478,31 @@ new_messages_arrived (ModestMailOperation *self, gint new_messages, gpointer user_data) { - if (new_messages == 0) - return; + ModestMainWindow *win = NULL; + GtkWidget *folder_view = NULL; + TnyFolderStore *folder = NULL; + gboolean folder_empty = FALSE; + + g_return_if_fail (MODEST_IS_MAIN_WINDOW (user_data)); + win = MODEST_MAIN_WINDOW (user_data); + + /* Set contents style of headers view */ + if (modest_main_window_get_contents_style (win) == MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY) { + folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), + MODEST_WIDGET_TYPE_FOLDER_VIEW); + folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view)); + + + folder_empty = (tny_folder_get_all_count (TNY_FOLDER (folder)) == 0); + + if (!folder_empty) + modest_main_window_set_contents_style (win, + MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS); + } - modest_platform_on_new_msg (); + /* Notify new messages have been downloaded */ + if (new_messages > 0) + modest_platform_on_new_msg (); } /* @@ -1367,7 +1551,7 @@ modest_ui_actions_do_send_receive (const gchar *account_name, ModestWindow *win) 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, NULL); + modest_mail_operation_update_account (mail_op, acc_name, new_messages_arrived, win); g_object_unref (G_OBJECT (mail_op)); /* Free */ @@ -1466,22 +1650,11 @@ modest_ui_actions_do_send_receive_all (ModestWindow *win) account_names = NULL; } -/* - * Handler of the click on Send&Receive button in the main toolbar - */ -void -modest_ui_actions_on_send_receive (GtkAction *action, ModestWindow *win) +void +modest_do_refresh_current_folder(ModestWindow *win) { - /* Check if accounts exist */ - gboolean 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 currently selected folder. Note that if we only - want to retrive the headers, then the refresh only will + 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)) { @@ -1492,10 +1665,12 @@ modest_ui_actions_on_send_receive (GtkAction *action, ModestWindow *win) folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), MODEST_WIDGET_TYPE_FOLDER_VIEW); + if (!folder_view) + return; folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); - if (TNY_IS_FOLDER (folder_store)) { + if (folder_store && TNY_IS_FOLDER (folder_store)) { header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), MODEST_WIDGET_TYPE_HEADER_VIEW); @@ -1509,8 +1684,28 @@ modest_ui_actions_on_send_receive (GtkAction *action, ModestWindow *win) folder_refreshed_cb, MODEST_MAIN_WINDOW (win)); } - g_object_unref (folder_store); + + if (folder_store) + g_object_unref (folder_store); } +} + + +/* + * Handler of the click on Send&Receive button in the main toolbar + */ +void +modest_ui_actions_on_send_receive (GtkAction *action, ModestWindow *win) +{ + /* Check if accounts exist */ + gboolean 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); + + modest_do_refresh_current_folder (win); /* Refresh the active account */ modest_ui_actions_do_send_receive (NULL, win); @@ -1558,6 +1753,20 @@ modest_ui_actions_on_header_selected (ModestHeaderView *header_view, g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window)); g_return_if_fail (MODEST_IS_HEADER_VIEW (header_view)); + /* in the case the folder is empty, show the empty folder message and focus + * folder view */ + if (!header && gtk_widget_is_focus (GTK_WIDGET (header_view))) { + if (modest_header_view_is_empty (header_view)) { + TnyFolder *folder = modest_header_view_get_folder (header_view); + GtkWidget *folder_view = + modest_main_window_get_child_widget (main_window, + MODEST_WIDGET_TYPE_FOLDER_VIEW); + if (folder != NULL) + modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view), folder, FALSE); + gtk_widget_grab_focus (GTK_WIDGET (folder_view)); + return; + } + } /* If no header has been selected then exit */ if (!header) return; @@ -1566,15 +1775,6 @@ modest_ui_actions_on_header_selected (ModestHeaderView *header_view, if (!gtk_widget_is_focus (GTK_WIDGET(header_view))) gtk_widget_grab_focus (GTK_WIDGET(header_view)); - /* Update Main window title */ - if (gtk_widget_is_focus (GTK_WIDGET(header_view))) { - const gchar *subject = tny_header_get_subject (header); - if (subject && strlen(subject) > 0) - gtk_window_set_title (GTK_WINDOW (main_window), subject); - else - gtk_window_set_title (GTK_WINDOW (main_window), _("mail_va_no_subject")); - } - /* Update toolbar dimming state */ modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window)); } @@ -1591,8 +1791,10 @@ modest_ui_actions_on_header_activated (ModestHeaderView *header_view, if (!header) return; - headers = tny_simple_list_new (); - tny_list_prepend (headers, G_OBJECT (header)); + +/* headers = tny_simple_list_new (); */ +/* tny_list_prepend (headers, G_OBJECT (header)); */ + headers = modest_header_view_get_selected_headers (header_view); _modest_ui_actions_open (headers, MODEST_WINDOW (main_window)); @@ -1627,6 +1829,9 @@ folder_refreshed_cb (ModestMailOperation *mail_op, { ModestMainWindow *win = NULL; GtkWidget *header_view; + TnyFolder *current_folder; + gboolean folder_empty = FALSE; + gboolean all_marked_as_deleted = FALSE; g_return_if_fail (TNY_IS_FOLDER (folder)); @@ -1634,9 +1839,20 @@ folder_refreshed_cb (ModestMailOperation *mail_op, header_view = modest_main_window_get_child_widget(win, MODEST_WIDGET_TYPE_HEADER_VIEW); + if (header_view) { + current_folder = modest_header_view_get_folder (MODEST_HEADER_VIEW (header_view)); + if (current_folder != NULL && folder != current_folder) { + return; + } + } + /* Check if folder is empty and set headers view contents style */ - if (tny_folder_get_all_count (folder) == 0) { - printf ("DEBUG: %s: tny_folder_get_all_count() returned 0.\n", __FUNCTION__); + folder_empty = (tny_folder_get_all_count (folder) == 0); + all_marked_as_deleted = modest_header_view_is_empty (MODEST_HEADER_VIEW(header_view)); + folder_empty = folder_empty || all_marked_as_deleted ; + if (folder_empty) { + + printf ("DEBUG: %s: tny_folder_get_all_count() returned 0.\n", __FUNCTION__); modest_main_window_set_contents_style (win, MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY); } else { @@ -1736,17 +1952,18 @@ modest_ui_actions_on_item_not_found (ModestHeaderView *header_view,ModestItemTyp dialog = gtk_message_dialog_new (GTK_WINDOW (win), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, - GTK_BUTTONS_OK, + GTK_BUTTONS_NONE, _("The %s you selected cannot be found"), item); + gtk_dialog_add_button (GTK_DIALOG (dialog),_("mcen_bd_dialog_ok"), GTK_RESPONSE_ACCEPT); gtk_dialog_run (GTK_DIALOG(dialog)); } else { dialog = gtk_dialog_new_with_buttons (_("Connection requested"), GTK_WINDOW (win), GTK_DIALOG_MODAL, - GTK_STOCK_CANCEL, + _("mcen_bd_dialog_cancel"), GTK_RESPONSE_REJECT, - GTK_STOCK_OK, + _("mcen_bd_dialog_ok"), GTK_RESPONSE_ACCEPT, NULL); txt = g_strdup_printf (_("This %s is not available in offline mode.\n" @@ -1758,7 +1975,8 @@ modest_ui_actions_on_item_not_found (ModestHeaderView *header_view,ModestItemTyp gtk_window_set_default_size (GTK_WINDOW(dialog), 300, 300); if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { -// modest_platform_connect_and_wait (); + /* TODO: Comment about why is this commented out: */ + /* modest_platform_connect_and_wait (); */ } } gtk_widget_destroy (dialog); @@ -1810,7 +2028,6 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi gchar *account_name, *from; ModestAccountMgr *account_mgr; gchar *info_text = NULL; - TnyMsg *new_draft = NULL; g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window)); @@ -1847,18 +2064,19 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi mail_operation = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_INFO, G_OBJECT(edit_window)); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_operation); - new_draft = modest_mail_operation_save_to_drafts (mail_operation, - transport_account, - data->draft_msg, - from, - data->to, - data->cc, - data->bcc, - data->subject, - data->plain_body, - data->html_body, - data->attachments, - data->priority_flags); + modest_mail_operation_save_to_drafts (mail_operation, + transport_account, + data->draft_msg, + edit_window, + from, + data->to, + data->cc, + data->bcc, + data->subject, + data->plain_body, + data->html_body, + data->attachments, + data->priority_flags); /* Frees */ g_free (from); g_free (account_name); @@ -1867,10 +2085,6 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi modest_msg_edit_window_free_msg_data (edit_window, data); - modest_msg_edit_window_set_draft (edit_window, new_draft); - if (new_draft != NULL) - g_object_unref (new_draft); - info_text = g_strdup_printf (_("mail_va_saved_to_drafts"), _("mcen_me_folder_drafts")); modest_platform_information_banner (NULL, NULL, info_text); g_free (info_text); @@ -1882,11 +2096,11 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) { g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window)); - if (!modest_msg_edit_window_check_names (edit_window)) + if (!modest_msg_edit_window_check_names (edit_window, TRUE)) return; /* Offer the connection dialog, if necessary: */ - if (!modest_platform_connect_and_wait (GTK_WINDOW (edit_window))) + if (!modest_platform_connect_and_wait (GTK_WINDOW (edit_window), NULL)) return; /* FIXME: Code added just for testing. The final version will @@ -1898,8 +2112,10 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) account_name = modest_account_mgr_get_default_account (account_mgr); if (!account_name) { - g_printerr ("modest: no account found\n"); - return; + /* Run account setup wizard */ + const gboolean created = modest_run_account_setup_wizard(MODEST_WINDOW(edit_window)); + if (!created) + return; } MsgData *data = modest_msg_edit_window_get_msg_data (edit_window); @@ -1914,43 +2130,14 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) (modest_runtime_get_account_store(), account_name)); if (!transport_account) { - 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; + /* Run account setup wizard */ + const gboolean created = modest_run_account_setup_wizard(MODEST_WINDOW(edit_window)); + if (!created) + return; } gchar *from = modest_account_mgr_get_from_string (account_mgr, account_name); - /* mail content checks and dialogs */ - if (data->subject == NULL || data->subject[0] == '\0') { - GtkResponseType response; - response = modest_platform_run_confirmation_dialog (GTK_WINDOW (edit_window), - _("mcen_nc_subject_is_empty_send")); - if (response == GTK_RESPONSE_CANCEL) { - g_free (account_name); - return; - } - } - - if (data->plain_body == NULL || data->plain_body[0] == '\0') { - GtkResponseType response; - gchar *note_message; - gchar *note_subject = data->subject; - if (note_subject == NULL || note_subject[0] == '\0') - note_subject = _("mail_va_no_subject"); - note_message = g_strdup_printf (_("emev_ni_ui_smtp_message_null"), note_subject); - response = modest_platform_run_confirmation_dialog (GTK_WINDOW (edit_window), - note_message); - g_free (note_message); - if (response == GTK_RESPONSE_CANCEL) { - g_free (account_name); - return; - } - } - - modest_platform_information_banner (NULL, NULL, _("mcen_ib_outbox_waiting_to_be_sent")); - /* Create the mail operation */ ModestMailOperation *mail_operation = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_SEND, G_OBJECT(edit_window)); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_operation); @@ -2113,7 +2300,7 @@ modest_ui_actions_on_attach_file (GtkAction *action, g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window)); g_return_if_fail (GTK_IS_ACTION (action)); - modest_msg_edit_window_attach_file (window); + modest_msg_edit_window_offer_attach_file (window); } void @@ -2131,32 +2318,20 @@ modest_ui_actions_new_folder_error_handler (ModestMailOperation *mail_op, gpointer user_data) { ModestMainWindow *window = MODEST_MAIN_WINDOW (user_data); + const GError *error = modest_mail_operation_get_error (mail_op); - /* TODO: Note that folder creation might go wrong due to other - * failures such as when the parent folder is non-writable. We can - * query a GError* with modest_mail_operation_get_error(), but the - * the error code (from tinymail) does not give us a clue about what - * has gone wrong. We might use the error->message but it might come - * from camel and not be suitable to show to the user directly. */ - modest_platform_information_banner (GTK_WIDGET (window), NULL, - _CS("ckdg_ib_folder_already_exists")); - -/* modest_platform_information_banner (GTK_WIDGET (window), NULL, - modest_mail_operation_get_error (mail_op)->message);*/ + if(error) + { + modest_platform_information_banner (GTK_WIDGET (window), NULL, + modest_mail_operation_get_error (mail_op)->message); + } } -void -modest_ui_actions_on_new_folder (GtkAction *action, ModestMainWindow *main_window) +static void +modest_ui_actions_create_folder(GtkWidget *parent_window, + GtkWidget *folder_view) { TnyFolderStore *parent_folder; - GtkWidget *folder_view; - - g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window)); - - folder_view = modest_main_window_get_child_widget (main_window, - MODEST_WIDGET_TYPE_FOLDER_VIEW); - if (!folder_view) - return; parent_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view)); @@ -2164,10 +2339,25 @@ modest_ui_actions_on_new_folder (GtkAction *action, ModestMainWindow *main_windo 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 (main_window), + result = modest_platform_run_new_folder_dialog (GTK_WINDOW (parent_window), parent_folder, suggested_name, &folder_name); @@ -2182,9 +2372,9 @@ modest_ui_actions_on_new_folder (GtkAction *action, ModestMainWindow *main_windo TnyFolder *new_folder = NULL; mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_INFO, - G_OBJECT(main_window), + G_OBJECT(parent_window), modest_ui_actions_new_folder_error_handler, - main_window); + parent_window); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); @@ -2192,6 +2382,9 @@ modest_ui_actions_on_new_folder (GtkAction *action, ModestMainWindow *main_windo 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; } @@ -2206,25 +2399,43 @@ modest_ui_actions_on_new_folder (GtkAction *action, ModestMainWindow *main_windo } } +void +modest_ui_actions_on_new_folder (GtkAction *action, ModestMainWindow *main_window) +{ + GtkWidget *folder_view; + + g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window)); + + folder_view = modest_main_window_get_child_widget (main_window, + MODEST_WIDGET_TYPE_FOLDER_VIEW); + if (!folder_view) + return; + + modest_ui_actions_create_folder (GTK_WIDGET (main_window), folder_view); +} + static void modest_ui_actions_rename_folder_error_handler (ModestMailOperation *mail_op, gpointer user_data) { - GObject *win = modest_mail_operation_get_source (mail_op); + ModestMainWindow *window = MODEST_MAIN_WINDOW (user_data); 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 = _("!!! FIXME: Unable to rename"); + if (!error) + g_return_if_reached (); + + switch (error->code) { + case MODEST_MAIL_OPERATION_ERROR_FOLDER_EXISTS: + message = _CS("ckdg_ib_folder_already_exists"); + break; + default: + g_return_if_reached (); } - - /* Show notification dialog */ - modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL, message); - g_object_unref (win); + + modest_platform_information_banner (GTK_WIDGET (window), NULL, message); } void @@ -2250,36 +2461,52 @@ modest_ui_actions_on_rename_folder (GtkAction *action, folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view)); - /* Offer the connection dialog if necessary: */ - if (!modest_platform_connect_and_wait_if_network_folderstore (NULL, folder)) { - g_object_unref (G_OBJECT (folder)); + if (!folder) return; - } - - if (folder && TNY_IS_FOLDER (folder)) { + if (TNY_IS_FOLDER (folder)) { gchar *folder_name; gint response; const gchar *current_name; + TnyFolderStore *parent; + gboolean do_rename = TRUE; current_name = tny_folder_get_name (TNY_FOLDER (folder)); - response = modest_platform_run_rename_folder_dialog (GTK_WINDOW (main_window), NULL, - current_name, &folder_name); - - if (response == GTK_RESPONSE_ACCEPT && strlen (folder_name) > 0) { + parent = tny_folder_get_folder_store (TNY_FOLDER (folder)); + response = modest_platform_run_rename_folder_dialog (GTK_WINDOW (main_window), + parent, current_name, + &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 (MODEST_MAIL_OPERATION_TYPE_INFO, + modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_INFO, G_OBJECT(main_window), modest_ui_actions_rename_folder_error_handler, - NULL); - + main_window); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); - modest_header_view_clear (MODEST_HEADER_VIEW (header_view)); + /* 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); modest_mail_operation_rename_folder (mail_op, TNY_FOLDER (folder), @@ -2288,8 +2515,8 @@ modest_ui_actions_on_rename_folder (GtkAction *action, g_object_unref (mail_op); g_free (folder_name); } - g_object_unref (folder); } + g_object_unref (folder); } static void @@ -2310,8 +2537,9 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) GtkWidget *folder_view; gint response; gchar *message; - - g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window)); + gboolean do_delete = TRUE; + + g_return_if_fail (MODEST_IS_MAIN_WINDOW (main_window)); folder_view = modest_main_window_get_child_widget (main_window, MODEST_WIDGET_TYPE_FOLDER_VIEW); @@ -2328,12 +2556,6 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) return ; } - /* Offer the connection dialog if necessary: */ - if (!modest_platform_connect_and_wait_if_network_folderstore (NULL, folder)) { - g_object_unref (G_OBJECT (folder)); - return; - } - /* Ask the user */ message = g_strdup_printf (_("mcen_nc_delete_folder_text"), tny_folder_get_name (TNY_FOLDER (folder))); @@ -2341,8 +2563,25 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) (const gchar *) message); g_free (message); - if (response == GTK_RESPONSE_OK) { - ModestMailOperation *mail_op = + 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 (MODEST_MAIL_OPERATION_TYPE_DELETE, G_OBJECT(main_window), modest_ui_actions_delete_folder_error_handler, @@ -2361,9 +2600,15 @@ void modest_ui_actions_on_delete_folder (GtkAction *action, ModestMainWindow *main_window) { + GtkWidget *folder_view; g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window)); delete_folder (main_window, FALSE); + folder_view = modest_main_window_get_child_widget (main_window, + MODEST_WIDGET_TYPE_FOLDER_VIEW); + if (!folder_view) + return; + modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (folder_view)); } void @@ -2374,6 +2619,27 @@ modest_ui_actions_on_move_folder_to_trash_folder (GtkAction *action, ModestMainW delete_folder (main_window, TRUE); } + +static void +show_error (GtkWidget *parent_widget, const gchar* text) +{ + hildon_banner_show_information(parent_widget, NULL, text); + +#if 0 + GtkDialog *dialog = GTK_DIALOG (hildon_note_new_information (parent_window, text)); */ + /* + GtkDialog *dialog = GTK_DIALOG (gtk_message_dialog_new (parent_window, + (GtkDialogFlags)0, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + text )); + */ + + gtk_dialog_run (dialog); + gtk_widget_destroy (GTK_WIDGET (dialog)); +#endif +} + void modest_ui_actions_on_password_requested (TnyAccountStore *account_store, const gchar* server_account_name, @@ -2400,9 +2666,9 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store, GtkWidget *dialog = gtk_dialog_new_with_buttons (_("mail_ti_password_protected"), NULL, GTK_DIALOG_MODAL, - GTK_STOCK_OK, + _("mcen_bd_dialog_ok"), GTK_RESPONSE_ACCEPT, - GTK_STOCK_CANCEL, + _("mcen_bd_dialog_cancel"), GTK_RESPONSE_REJECT, NULL); #else @@ -2531,6 +2797,8 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store, *cancel = FALSE; } else { + show_error(GTK_WIDGET (main_window), _("mail_ib_login_cancelled")); + if (username) *username = NULL; @@ -2558,20 +2826,43 @@ modest_ui_actions_on_cut (GtkAction *action, ModestWindow *window) { GtkWidget *focused_widget; + GtkClipboard *clipboard; + clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); focused_widget = gtk_window_get_focus (GTK_WINDOW (window)); if (GTK_IS_EDITABLE (focused_widget)) { gtk_editable_cut_clipboard (GTK_EDITABLE(focused_widget)); + gtk_clipboard_set_can_store (clipboard, NULL, 0); + gtk_clipboard_store (clipboard); } else if (GTK_IS_TEXT_VIEW (focused_widget)) { GtkTextBuffer *buffer; - GtkClipboard *clipboard; - clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); 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); } else if (MODEST_IS_HEADER_VIEW (focused_widget)) { - modest_header_view_cut_selection (MODEST_HEADER_VIEW (focused_widget)); + TnyList *header_list = modest_header_view_get_selected_headers ( + MODEST_HEADER_VIEW (focused_widget)); + gboolean continue_download = FALSE; + gint num_of_unc_msgs; + + num_of_unc_msgs = header_list_count_uncached_msgs( + header_list, GTK_WINDOW (window)); + + if (num_of_unc_msgs) + continue_download = connect_to_get_msg( + GTK_WINDOW (window), + num_of_unc_msgs); + + if (num_of_unc_msgs == 0 || continue_download) { +/* modest_platform_information_banner ( + NULL, NULL, _CS("mcen_ib_getting_items"));*/ + modest_header_view_cut_selection ( + MODEST_HEADER_VIEW (focused_widget)); + } + + g_object_unref (header_list); } else if (MODEST_IS_FOLDER_VIEW (focused_widget)) { modest_folder_view_cut_selection (MODEST_FOLDER_VIEW (focused_widget)); } @@ -2583,48 +2874,62 @@ modest_ui_actions_on_copy (GtkAction *action, { GtkClipboard *clipboard; GtkWidget *focused_widget; + gboolean copied = TRUE; clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); 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); + gtk_clipboard_set_can_store (clipboard, NULL, 0); + gtk_clipboard_store (clipboard); } else if (GTK_IS_EDITABLE (focused_widget)) { gtk_editable_copy_clipboard (GTK_EDITABLE(focused_widget)); + gtk_clipboard_set_can_store (clipboard, NULL, 0); + gtk_clipboard_store (clipboard); + } else if (GTK_IS_HTML (focused_widget)) { + gtk_html_copy (GTK_HTML (focused_widget)); + gtk_clipboard_set_can_store (clipboard, NULL, 0); + gtk_clipboard_store (clipboard); } 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); } else if (MODEST_IS_HEADER_VIEW (focused_widget)) { - TnyList *header_list = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (focused_widget)); - TnyIterator *iter = tny_list_create_iterator (header_list); - TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter)); - TnyFolder *folder = tny_header_get_folder (header); - TnyAccount *account = tny_folder_get_account (folder); - const gchar *proto_str = tny_account_get_proto (TNY_ACCOUNT (account)); - /* If it's POP then ask */ - gboolean ask = (modest_protocol_info_get_transport_store_protocol (proto_str) == - MODEST_PROTOCOL_STORE_POP) ? TRUE : FALSE; - g_object_unref (account); - g_object_unref (folder); - g_object_unref (header); - g_object_unref (iter); - - /* Check that the messages have been previously downloaded */ - gboolean continue_download = TRUE; - if (ask) - continue_download = download_uncached_messages (header_list, GTK_WINDOW (window)); - if (continue_download) - modest_header_view_copy_selection (MODEST_HEADER_VIEW (focused_widget)); + TnyList *header_list = modest_header_view_get_selected_headers ( + MODEST_HEADER_VIEW (focused_widget)); + gboolean continue_download = FALSE; + gint num_of_unc_msgs; + + num_of_unc_msgs = header_list_count_uncached_msgs( + header_list, + GTK_WINDOW (window)); + + if (num_of_unc_msgs) + continue_download = connect_to_get_msg( + GTK_WINDOW (window), + num_of_unc_msgs); + + if (num_of_unc_msgs == 0 || continue_download) { + modest_platform_information_banner ( + NULL, NULL, _CS("mcen_ib_getting_items")); + modest_header_view_copy_selection ( + MODEST_HEADER_VIEW (focused_widget)); + } else + copied = FALSE; + g_object_unref (header_list); + } else if (MODEST_IS_FOLDER_VIEW (focused_widget)) { modest_folder_view_copy_selection (MODEST_FOLDER_VIEW (focused_widget)); - } + } - /* Show information banner */ - modest_platform_information_banner (NULL, NULL, _CS("ecoc_ib_edwin_copied")); - + /* Show information banner if there was a copy to clipboard */ + if(copied) + modest_platform_information_banner ( + NULL, NULL, _CS("ecoc_ib_edwin_copied")); } void @@ -2668,6 +2973,32 @@ paste_msgs_cb (const GObject *object, gpointer user_data) gtk_widget_destroy (GTK_WIDGET(user_data)); } +static void +paste_as_attachment_free (gpointer data) +{ + PasteAsAttachmentHelper *helper = (PasteAsAttachmentHelper *) data; + + gtk_widget_destroy (helper->banner); + g_object_unref (helper->banner); + g_free (helper); +} + +static void +paste_msg_as_attachment_cb (ModestMailOperation *mail_op, + TnyHeader *header, + TnyMsg *msg, + gpointer userdata) +{ + PasteAsAttachmentHelper *helper = (PasteAsAttachmentHelper *) userdata; + g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (helper->window)); + + if (msg == NULL) + return; + + modest_msg_edit_window_add_part (MODEST_MSG_EDIT_WINDOW (helper->window), TNY_MIME_PART (msg)); + +} + void modest_ui_actions_on_paste (GtkAction *action, ModestWindow *window) @@ -2680,12 +3011,41 @@ modest_ui_actions_on_paste (GtkAction *action, if (GTK_IS_EDITABLE (focused_widget)) { gtk_editable_paste_clipboard (GTK_EDITABLE(focused_widget)); } else if (GTK_IS_TEXT_VIEW (focused_widget)) { - GtkTextBuffer *buffer; - GtkClipboard *clipboard; + ModestEmailClipboard *e_clipboard = NULL; + e_clipboard = modest_runtime_get_email_clipboard (); + if (modest_email_clipboard_cleared (e_clipboard)) { + GtkTextBuffer *buffer; + GtkClipboard *clipboard; + + clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused_widget)); + gtk_text_buffer_paste_clipboard (buffer, clipboard, NULL, TRUE); + } else if (MODEST_IS_MSG_EDIT_WINDOW (window)) { + ModestMailOperation *mail_op; + TnyFolder *src_folder; + TnyList *data; + gboolean delete; + PasteAsAttachmentHelper *helper = g_new0 (PasteAsAttachmentHelper, 1); + helper->window = MODEST_MSG_EDIT_WINDOW (window); + helper->banner = modest_platform_animation_banner (GTK_WIDGET (window), NULL, + _CS("ckct_nw_pasting")); + modest_email_clipboard_get_data (e_clipboard, &src_folder, &data, &delete); + mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, + G_OBJECT (window)); + if (helper->banner != NULL) { + g_object_ref (G_OBJECT (helper->banner)); + gtk_window_set_modal (GTK_WINDOW (helper->banner), FALSE); + gtk_widget_show (GTK_WIDGET (helper->banner)); + } - clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused_widget)); - gtk_text_buffer_paste_clipboard (buffer, clipboard, NULL, TRUE); + if (data != NULL) { + modest_mail_operation_get_msgs_full (mail_op, + data, + (GetMsgAsyncUserCallback) paste_msg_as_attachment_cb, + helper, + paste_as_attachment_free); + } + } } else if (MODEST_IS_FOLDER_VIEW (focused_widget)) { ModestEmailClipboard *clipboard = NULL; TnyFolder *src_folder = NULL; @@ -2703,30 +3063,50 @@ modest_ui_actions_on_paste (GtkAction *action, /* Create a new mail operation */ mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(window)); - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), - mail_op); /* Get destination folder */ folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (focused_widget)); - /* Launch notification */ - inf_note = modest_platform_animation_banner (GTK_WIDGET (window), NULL, - _CS("ckct_nw_pasting")); - if (inf_note != NULL) { - gtk_window_set_modal (GTK_WINDOW(inf_note), FALSE); - gtk_widget_show (GTK_WIDGET(inf_note)); - } - /* transfer messages */ if (data != NULL) { - modest_mail_operation_xfer_msgs (mail_op, - data, - TNY_FOLDER (folder_store), - delete, - paste_msgs_cb, - inf_note); + gint response = 0; + + /* Ask for user confirmation */ + response = msgs_move_to_confirmation (GTK_WINDOW (window), + TNY_FOLDER (folder_store), + delete, + data); + + if (response == GTK_RESPONSE_OK) { + /* Launch notification */ + inf_note = modest_platform_animation_banner (GTK_WIDGET (window), NULL, + _CS("ckct_nw_pasting")); + if (inf_note != NULL) { + gtk_window_set_modal (GTK_WINDOW(inf_note), FALSE); + gtk_widget_show (GTK_WIDGET(inf_note)); + } + + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); + modest_mail_operation_xfer_msgs (mail_op, + data, + TNY_FOLDER (folder_store), + delete, + paste_msgs_cb, + inf_note); + } else { + g_object_unref (mail_op); + } } else if (src_folder != NULL) { + /* Launch notification */ + inf_note = modest_platform_animation_banner (GTK_WIDGET (window), NULL, + _CS("ckct_nw_pasting")); + if (inf_note != NULL) { + gtk_window_set_modal (GTK_WINDOW(inf_note), FALSE); + gtk_widget_show (GTK_WIDGET(inf_note)); + } + + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); modest_mail_operation_xfer_folder (mail_op, src_folder, folder_store, @@ -2773,16 +3153,25 @@ modest_ui_actions_on_select_all (GtkAction *action, GtkWidget *header_view = focused_widget; GtkTreeSelection *selection = NULL; - if (!(MODEST_IS_HEADER_VIEW (focused_widget))) + if (!(MODEST_IS_HEADER_VIEW (focused_widget))) { header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (window), MODEST_WIDGET_TYPE_HEADER_VIEW); + } + /* Disable window dimming management */ + modest_window_disable_dimming (MODEST_WINDOW(window)); + /* Select all messages */ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(header_view)); gtk_tree_selection_select_all (selection); /* Set focuse on header view */ gtk_widget_grab_focus (header_view); + + + /* Enable window dimming management */ + modest_window_enable_dimming (MODEST_WINDOW(window)); + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window)); } } @@ -2912,6 +3301,7 @@ headers_action_show_details (TnyHeader *header, dialog = modest_details_dialog_new_with_header (GTK_WINDOW (window), header); /* Run dialog */ + gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); gtk_widget_show_all (dialog); gtk_dialog_run (GTK_DIALOG (dialog)); @@ -2931,6 +3321,7 @@ show_folder_details (TnyFolder *folder, dialog = modest_details_dialog_new_with_folder (window, folder); /* Run dialog */ + gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); gtk_widget_show_all (dialog); gtk_dialog_run (GTK_DIALOG (dialog)); @@ -2963,8 +3354,10 @@ modest_ui_actions_on_details (GtkAction *action, iter = tny_list_create_iterator (headers_list); header = TNY_HEADER (tny_iterator_get_current (iter)); - headers_action_show_details (header, win, NULL); - g_object_unref (header); + if (header) { + headers_action_show_details (header, win, NULL); + g_object_unref (header); + } g_object_unref (iter); g_object_unref (headers_list); @@ -3022,16 +3415,12 @@ void modest_ui_actions_toggle_folders_view (GtkAction *action, ModestMainWindow *main_window) { - ModestConf *conf; - g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window)); - conf = modest_runtime_get_conf (); - - if (modest_main_window_get_style (main_window) == MODEST_MAIN_WINDOW_STYLE_SPLIT) - modest_main_window_set_style (main_window, MODEST_MAIN_WINDOW_STYLE_SIMPLE); - else + if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) modest_main_window_set_style (main_window, MODEST_MAIN_WINDOW_STYLE_SPLIT); + else + modest_main_window_set_style (main_window, MODEST_MAIN_WINDOW_STYLE_SIMPLE); } void @@ -3090,25 +3479,157 @@ void modest_ui_actions_on_check_names (GtkAction *action, ModestMsgEditWindow *window) { g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window)); - modest_msg_edit_window_check_names (window); + modest_msg_edit_window_check_names (window, FALSE); +} + +static void +create_move_to_dialog_on_new_folder(GtkWidget *button, gpointer user_data) +{ + modest_ui_actions_create_folder (gtk_widget_get_toplevel (button), + GTK_WIDGET (user_data)); } +/* + * This function is used to track changes in the selection of the + * folder view that is inside the "move to" dialog to enable/disable + * the OK button because we do not want the user to select a disallowed + * destination for a folder. + * The user also not desired to be able to use NEW button on items where + * folder creation is not possibel. + */ +static void +on_move_to_dialog_folder_selection_changed (ModestFolderView* self, + TnyFolderStore *folder_store, + gboolean selected, + gpointer user_data) +{ + GtkWidget *dialog = NULL; + GtkWidget *ok_button = NULL, *new_button = NULL; + GList *children = NULL; + gboolean ok_sensitive = TRUE, new_sensitive = TRUE; + gboolean moving_folder = FALSE; + gboolean is_remote_account = FALSE; + GtkWidget *folder_view = NULL; + + if (!selected) + return; + + /* Get the OK button */ + dialog = gtk_widget_get_ancestor (GTK_WIDGET (self), GTK_TYPE_DIALOG); + if (!dialog) + return; + + children = gtk_container_get_children (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area)); + ok_button = GTK_WIDGET (children->next->next->data); + new_button = GTK_WIDGET (children->next->data); + g_list_free (children); + + /* check if folder_store is an remote account */ + if (TNY_IS_ACCOUNT (folder_store)) { + TnyAccount *local_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) + is_remote_account = TRUE; + g_object_unref (local_account); + } + + /* New button should be dimmed on remote account root folder + * and on inbox folder. */ + if (is_remote_account) + new_sensitive = FALSE; + + /* check if folder_store is an rmeote inbox folder */ + if (TNY_IS_FOLDER (folder_store)) + if (tny_folder_get_folder_type(TNY_FOLDER(folder_store)) + == TNY_FOLDER_TYPE_INBOX) + new_sensitive = FALSE; + + /* If it */ + if (MODEST_IS_MAIN_WINDOW (user_data)) { + /* Get the widgets */ + folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (user_data), + MODEST_WIDGET_TYPE_FOLDER_VIEW); + if (gtk_widget_is_focus (folder_view)) + moving_folder = TRUE; + } + + if (moving_folder) { + TnyFolderStore *moved_folder = NULL, *parent = NULL; + + /* Get the folder to move */ + moved_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); + + /* Check that we're not moving to the same folder */ + if (TNY_IS_FOLDER (moved_folder)) { + parent = tny_folder_get_folder_store (TNY_FOLDER (moved_folder)); + if (parent == folder_store) + ok_sensitive = FALSE; + g_object_unref (parent); + } + + if (ok_sensitive && TNY_IS_ACCOUNT (folder_store)) { + /* Do not allow to move to an account unless it's the + local folders account */ + if (is_remote_account) + ok_sensitive = FALSE; + } + + if (ok_sensitive && (moved_folder == folder_store)) { + /* Do not allow to move to itself */ + ok_sensitive = FALSE; + } + 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); + } else { + src_folder = + 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); + } + + /* Set sensitivity of the OK button */ + gtk_widget_set_sensitive (ok_button, ok_sensitive); + /* Set sensitivity of the NEW button */ + gtk_widget_set_sensitive (new_button, new_sensitive); +} static GtkWidget* -create_move_to_dialog (ModestWindow *win, +create_move_to_dialog (GtkWindow *win, GtkWidget *folder_view, GtkWidget **tree_view) { GtkWidget *dialog, *scroll; + GtkWidget *new_button; dialog = gtk_dialog_new_with_buttons (_("mcen_ti_moveto_folders_title"), GTK_WINDOW (win), GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR | GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_OK, - GTK_RESPONSE_ACCEPT, - GTK_STOCK_CANCEL, - GTK_RESPONSE_REJECT, - NULL); + NULL); + + gtk_dialog_add_button (GTK_DIALOG (dialog), _("mcen_bd_dialog_ok"), GTK_RESPONSE_ACCEPT); + /* We do this manually so GTK+ does not associate a response ID for + * the button. */ + new_button = gtk_button_new_from_stock (_("mcen_bd_new")); + gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->action_area), new_button, FALSE, FALSE, 0); + gtk_dialog_add_button (GTK_DIALOG (dialog), _("mcen_bd_dialog_cancel"), GTK_RESPONSE_REJECT); /* Create scrolled window */ scroll = gtk_scrolled_window_new (NULL, NULL); @@ -3119,27 +3640,67 @@ create_move_to_dialog (ModestWindow *win, /* Create folder view */ *tree_view = modest_platform_create_folder_view (NULL); + /* Track changes in the selection to + * disable the OK button whenever "Move to" is not possible + * disbale NEW button whenever New is not possible */ + g_signal_connect (*tree_view, + "folder_selection_changed", + G_CALLBACK (on_move_to_dialog_folder_selection_changed), + win); + + /* Listen to clicks on New button */ + g_signal_connect (G_OBJECT (new_button), + "clicked", + G_CALLBACK(create_move_to_dialog_on_new_folder), + *tree_view); + /* It could happen that we're trying to move a message from a window (msg window for example) after the main window was closed, so we can not just get the model of the folder view */ - if (MODEST_IS_FOLDER_VIEW (folder_view)) - gtk_tree_view_set_model (GTK_TREE_VIEW (*tree_view), - gtk_tree_view_get_model (GTK_TREE_VIEW (folder_view))); - else + if (MODEST_IS_FOLDER_VIEW (folder_view)) { + const gchar *visible_id = NULL; + + modest_folder_view_copy_model (MODEST_FOLDER_VIEW(folder_view), + MODEST_FOLDER_VIEW(*tree_view)); + + visible_id = + modest_folder_view_get_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(folder_view)); + + /* Show the same account than the one that is shown in the main window */ + modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(*tree_view), + visible_id); + } else { + const gchar *active_account_name = NULL; + ModestAccountMgr *mgr = NULL; + ModestAccountData *acc_data = NULL; + modest_folder_view_update_model (MODEST_FOLDER_VIEW (*tree_view), TNY_ACCOUNT_STORE (modest_runtime_get_account_store ())); + 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); + + /* 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); + } + } + + /* 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 */ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), - scroll, FALSE, FALSE, 0); + scroll, TRUE, TRUE, 0); gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox)); - - /* Select INBOX or local account */ - modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (*tree_view)); + gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 300); return dialog; } @@ -3148,6 +3709,7 @@ create_move_to_dialog (ModestWindow *win, * Returns TRUE if at least one of the headers of the list belongs to * a message that has been fully retrieved. */ +#if 0 /* no longer in use. delete in 2007.10 */ static gboolean has_retrieved_msgs (TnyList *list) { @@ -3155,14 +3717,19 @@ has_retrieved_msgs (TnyList *list) gboolean found = FALSE; iter = tny_list_create_iterator (list); - while (tny_iterator_is_done (iter) && !found) { + while (!tny_iterator_is_done (iter) && !found) { TnyHeader *header; - TnyHeaderFlags flags; + TnyHeaderFlags flags = 0; header = TNY_HEADER (tny_iterator_get_current (iter)); - flags = tny_header_get_flags (header); - if (!(flags & TNY_HEADER_FLAG_PARTIAL)) - found = TRUE; + if (header) { + flags = tny_header_get_flags (header); + if (flags & TNY_HEADER_FLAG_CACHED) +/* if (!(flags & TNY_HEADER_FLAG_PARTIAL)) */ + found = TRUE; + + g_object_unref (header); + } if (!found) tny_iterator_next (iter); @@ -3171,53 +3738,63 @@ has_retrieved_msgs (TnyList *list) return found; } +#endif /* 0 */ + /* * Shows a confirmation dialog to the user when we're moving messages * from a remote server to the local storage. Returns the dialog - * response. If it's other kind of movement the it always returns + * response. If it's other kind of movement then it always returns * GTK_RESPONSE_OK + * + * This one is used by the next functions: + * modest_ui_actions_xfer_messages_from_move_to + * modest_ui_actions_on_paste - commented out + * drag_and_drop_from_header_view (for d&d in modest_folder_view.c) */ -static gint +gint msgs_move_to_confirmation (GtkWindow *win, TnyFolder *dest_folder, + gboolean delete, TnyList *headers) { gint response = GTK_RESPONSE_OK; - /* If the destination is a local folder */ - if (modest_tny_folder_is_local_folder (dest_folder)) { - TnyFolder *src_folder; - TnyIterator *iter; - TnyHeader *header; + /* return with OK if the destination is a remote folder */ + if (modest_tny_folder_is_remote_folder (dest_folder)) + return GTK_RESPONSE_OK; - /* Get source folder */ - iter = tny_list_create_iterator (headers); - header = TNY_HEADER (tny_iterator_get_current (iter)); + TnyFolder *src_folder = NULL; + TnyIterator *iter = NULL; + TnyHeader *header = NULL; + + /* Get source folder */ + iter = tny_list_create_iterator (headers); + header = TNY_HEADER (tny_iterator_get_current (iter)); + if (header) { src_folder = tny_header_get_folder (header); g_object_unref (header); - g_object_unref (iter); + } + g_object_unref (iter); - /* if no src_folder, message may be an attahcment */ - if (src_folder == NULL) - return GTK_RESPONSE_CANCEL; + /* if no src_folder, message may be an attahcment */ + if (src_folder == NULL) + return GTK_RESPONSE_CANCEL; - /* If the source is a remote folder */ - if (!modest_tny_folder_is_local_folder (src_folder)) { - const gchar *message; - - if (has_retrieved_msgs (headers)) - message = ngettext ("mcen_nc_move_retrieve", "mcen_nc_move_retrieves", - tny_list_get_length (headers)); - else - message = ngettext ("mcen_nc_move_header", "mcen_nc_move_headers", - tny_list_get_length (headers)); - - response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win), - (const gchar *) message); - } + /* If the source is a local or MMC folder */ + if (!modest_tny_folder_is_remote_folder (src_folder)) { g_object_unref (src_folder); + return GTK_RESPONSE_OK; } + g_object_unref (src_folder); + + /* now if offline we ask the user */ + if(connect_to_get_msg( GTK_WINDOW (win), + tny_list_get_length (headers))) + response = GTK_RESPONSE_OK; + else + response = GTK_RESPONSE_CANCEL; + return response; } @@ -3227,22 +3804,14 @@ static void transfer_msgs_from_viewer_cb (const GObject *object, gpointer user_data) { ModestMsgViewWindow *self = NULL; - gboolean last, first; g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (object)); self = MODEST_MSG_VIEW_WINDOW (object); - last = modest_msg_view_window_last_message_selected (self); - first = modest_msg_view_window_first_message_selected (self); - if (last & first) { - /* No more messages to view, so close this window */ -/* gboolean ret_value; */ -/* g_signal_emit_by_name (G_OBJECT (self), "delete-event", NULL, &ret_value); */ - modest_ui_actions_on_close_window (NULL, MODEST_WINDOW(self)); - } else if (last) - modest_msg_view_window_select_previous_message (self); - else - modest_msg_view_window_select_next_message (self); + 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)); } void @@ -3300,10 +3869,13 @@ open_msg_for_purge_cb (ModestMailOperation *mail_op, gint pending_purges = 0; gboolean some_purged = FALSE; ModestWindow *win = MODEST_WINDOW (user_data); + ModestWindowMgr *mgr = modest_runtime_get_window_mgr (); /* If there was any error */ - if (!modest_ui_actions_msg_retrieval_check (mail_op, header, msg)) + if (!modest_ui_actions_msg_retrieval_check (mail_op, header, msg)) { + modest_window_mgr_unregister_header (mgr, header); return; + } /* Once the message has been retrieved for purging, we check if * it's all ok for purging */ @@ -3315,12 +3887,16 @@ open_msg_for_purge_cb (ModestMailOperation *mail_op, while (!tny_iterator_is_done (iter)) { TnyMimePart *part; part = TNY_MIME_PART (tny_iterator_get_current (iter)); - if (tny_mime_part_is_attachment (part) || TNY_IS_MSG (part)) { + if (part && (tny_mime_part_is_attachment (part) || TNY_IS_MSG (part))) { if (tny_mime_part_is_purged (part)) some_purged = TRUE; else pending_purges++; } + + if (part) + g_object_unref (part); + tny_iterator_next (iter); } @@ -3335,8 +3911,12 @@ open_msg_for_purge_cb (ModestMailOperation *mail_op, TnyMimePart *part; part = TNY_MIME_PART (tny_iterator_get_current (iter)); - if (tny_mime_part_is_attachment (part) || TNY_IS_MSG (part)) + if (part && (tny_mime_part_is_attachment (part) || TNY_IS_MSG (part))) tny_mime_part_set_purged (part); + + if (part) + g_object_unref (part); + tny_iterator_next (iter); } @@ -3352,9 +3932,17 @@ open_msg_for_purge_cb (ModestMailOperation *mail_op, TnyMimePart *part; part = TNY_MIME_PART (tny_iterator_get_current (iter)); - g_object_unref (part); + if (part) { + /* One for the reference given by tny_iterator_get_current(): */ + g_object_unref (part); + + /* TODO: Is this meant to remove the attachment by doing another unref()? + * Otherwise, this seems useless. */ + } + tny_iterator_next (iter); } + modest_window_mgr_unregister_header (mgr, header); g_object_unref (iter); g_object_unref (parts); @@ -3417,129 +4005,155 @@ modest_ui_actions_on_main_window_remove_attachments (GtkAction *action, g_object_unref (header_list); } -/* - * UI handler for the "Move to" action when invoked from the - * ModestMainWindow +/** + * Utility function that transfer messages from both the main window + * and the msg view window when using the "Move to" dialog */ -static void -modest_ui_actions_on_main_window_move_to (GtkAction *action, - ModestMainWindow *win) +static void +modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder, + ModestWindow *win) { - GtkWidget *dialog = NULL, *folder_view = NULL, *tree_view = NULL; - GtkWidget *header_view = NULL; - gint result = 0; - TnyFolderStore *folder_store = NULL; - ModestMailOperation *mail_op = NULL; - - g_return_if_fail (MODEST_IS_MAIN_WINDOW (win)); - - /* Get the folder view */ - folder_view = modest_main_window_get_child_widget (win, - MODEST_WIDGET_TYPE_FOLDER_VIEW); - - TnyFolderStore *src_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); - - /* Offer the connection dialog if necessary, if the source folder is in a networked account: */ - if (!modest_platform_connect_and_wait_if_network_folderstore (GTK_WINDOW (win), src_folder)) { - if (src_folder) { - g_object_unref (src_folder); - } - + TnyList *headers = NULL; + gint response = 0; + 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")); return; } - /* Get header view */ - header_view = modest_main_window_get_child_widget (win, - MODEST_WIDGET_TYPE_HEADER_VIEW); + dst_account = tny_folder_get_account (TNY_FOLDER (dst_folder)); + proto_str = tny_account_get_proto (dst_account); - /* Create and run the dialog */ - dialog = create_move_to_dialog (MODEST_WINDOW (win), folder_view, &tree_view); - modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (tree_view)); - result = gtk_dialog_run (GTK_DIALOG(dialog)); - g_object_ref (tree_view); - - /* We do this to save an indentation level ;-) */ - if (result != GTK_RESPONSE_ACCEPT) - goto end; + /* tinymail will return NULL for local folders it seems */ + dst_is_pop = proto_str && + (modest_protocol_info_get_transport_store_protocol (proto_str) == + MODEST_PROTOCOL_STORE_POP); - folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (tree_view)); + g_object_unref (dst_account); - if (TNY_IS_ACCOUNT (folder_store) && - !MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (folder_store)) - goto end; + /* Get selected headers */ + headers = get_selected_headers (MODEST_WINDOW (win)); - /* Offer the connection dialog if necessary: */ - if (!modest_platform_connect_and_wait_if_network_folderstore (GTK_WINDOW (win), folder_store)) { - goto end; + if (dst_is_pop) { + modest_platform_information_banner (GTK_WIDGET (win), + NULL, + ngettext("mail_in_ui_folder_move_target_error", + "mail_in_ui_folder_move_targets_error", + tny_list_get_length (headers))); + g_object_unref (headers); + return; } - /* Get folder or messages to transfer */ - if (gtk_widget_is_focus (folder_view)) { - - /* Clean folder on header view before moving it */ - modest_header_view_clear (MODEST_HEADER_VIEW (header_view)); + /* Ask for user confirmation */ + response = msgs_move_to_confirmation (GTK_WINDOW (win), + TNY_FOLDER (dst_folder), + TRUE, + headers); - if (TNY_IS_FOLDER (src_folder)) { - mail_op = - modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, + /* Transfer messages */ + if (response == GTK_RESPONSE_OK) { + ModestMailOperation *mail_op = + modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(win), modest_ui_actions_move_folder_error_handler, NULL); - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), + mail_op); - modest_mail_operation_xfer_folder (mail_op, - TNY_FOLDER (src_folder), - folder_store, - TRUE, NULL, NULL); - /* Unref mail operation */ - g_object_unref (G_OBJECT (mail_op)); - } else { - g_warning ("%s: src_folder is not a TnyFolder.\n", __FUNCTION__); - } - } else { - if (gtk_widget_is_focus (header_view)) { - TnyList *headers = NULL; - gint response = 0; + modest_mail_operation_xfer_msgs (mail_op, + headers, + TNY_FOLDER (dst_folder), + TRUE, + (MODEST_IS_MSG_VIEW_WINDOW (win)) ? transfer_msgs_from_viewer_cb : NULL, + NULL); - /* TODO: Check for connection if the headers are on a network account. */ - headers = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (header_view)); + g_object_unref (G_OBJECT (mail_op)); + } + g_object_unref (headers); +} - /* Ask for user confirmation */ - response = msgs_move_to_confirmation (GTK_WINDOW (win), - TNY_FOLDER (folder_store), - headers); +/* + * UI handler for the "Move to" action when invoked from the + * ModestMainWindow + */ +static void +modest_ui_actions_on_main_window_move_to (GtkAction *action, + GtkWidget *folder_view, + TnyFolderStore *dst_folder, + ModestMainWindow *win) +{ + ModestHeaderView *header_view = NULL; + ModestMailOperation *mail_op = NULL; + TnyFolderStore *src_folder; + gboolean online = (tny_device_is_online (modest_runtime_get_device())); - /* Transfer messages */ - if (response == GTK_RESPONSE_OK) { - mail_op = - modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, - G_OBJECT(win), - modest_ui_actions_move_folder_error_handler, - NULL); - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), - mail_op); + g_return_if_fail (MODEST_IS_MAIN_WINDOW (win)); - modest_mail_operation_xfer_msgs (mail_op, - headers, - TNY_FOLDER (folder_store), - TRUE, - NULL, - NULL); + /* Get the source folder */ + src_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); - g_object_unref (G_OBJECT (mail_op)); - } - g_object_unref (headers); - } + /* Get header view */ + header_view = MODEST_HEADER_VIEW(modest_main_window_get_child_widget (win, MODEST_WIDGET_TYPE_HEADER_VIEW)); + + /* Get folder or messages to transfer */ + if (gtk_widget_is_focus (folder_view)) { + GtkTreeSelection *sel; + 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)) { + do_xfer = FALSE; + } else if (!TNY_IS_FOLDER (src_folder)) { + g_warning ("%s: src_folder is not a TnyFolder.\n", __FUNCTION__); + do_xfer = FALSE; + } else if (!online && modest_platform_is_network_folderstore(src_folder)) { + guint num_headers = tny_folder_get_all_count(TNY_FOLDER(src_folder)); + if (!connect_to_get_msg(GTK_WINDOW(win), num_headers)) { + do_xfer = FALSE; + } + } + + if (do_xfer) { + /* 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 (MODEST_MAIL_OPERATION_TYPE_RECEIVE, + G_OBJECT(win), + modest_ui_actions_move_folder_error_handler, + NULL); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), + mail_op); + + modest_mail_operation_xfer_folder (mail_op, + TNY_FOLDER (src_folder), + dst_folder, + TRUE, NULL, NULL); + /* Unref mail operation */ + g_object_unref (G_OBJECT (mail_op)); + } + } 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)) { + guint num_headers = modest_header_view_count_selected_headers(header_view); + if (!connect_to_get_msg(GTK_WINDOW(win), num_headers)) { + do_xfer = FALSE; + } + } + if (do_xfer) /* Transfer messages */ + modest_ui_actions_xfer_messages_from_move_to (dst_folder, MODEST_WINDOW (win)); } - - end: + if (src_folder) g_object_unref (src_folder); - - if (folder_store) - g_object_unref (folder_store); - - gtk_widget_destroy (dialog); } @@ -3549,96 +4163,78 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action, */ static void modest_ui_actions_on_msg_view_window_move_to (GtkAction *action, + TnyFolderStore *dst_folder, ModestMsgViewWindow *win) { - GtkWidget *dialog, *folder_view, *tree_view = NULL; - gint result = 0; - ModestMainWindow *main_window = NULL; TnyHeader *header = NULL; - TnyList *headers = NULL; - - /* Get the folder view */ - main_window = MODEST_MAIN_WINDOW (modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ())); - if (main_window) - folder_view = modest_main_window_get_child_widget (main_window, - MODEST_WIDGET_TYPE_FOLDER_VIEW); - else - folder_view = NULL; - - /* Create and run the dialog */ - dialog = create_move_to_dialog (MODEST_WINDOW (win), folder_view, &tree_view); - result = gtk_dialog_run (GTK_DIALOG(dialog)); - - if (result == GTK_RESPONSE_ACCEPT) { - TnyFolderStore *folder_store; - gint response; - - /* Create header list */ - header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win)); - g_return_if_fail (header != NULL); - - /* Offer the connection dialog if necessary: */ - /* TODO: What's the extra g_object_ref() for? Isn't this leaking a ref? */ - folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (g_object_ref (tree_view))); - TnyFolder *header_folder = tny_header_get_folder(header); - if (modest_platform_connect_and_wait_if_network_folderstore (NULL, folder_store) && - modest_platform_connect_and_wait_if_network_folderstore (NULL, TNY_FOLDER_STORE (header_folder))) { - - headers = tny_simple_list_new (); - tny_list_prepend (headers, G_OBJECT (header)); - g_object_unref (header); + TnyFolderStore *src_folder; - /* Ask user for confirmation. MSG-NOT404 */ - response = msgs_move_to_confirmation (GTK_WINDOW (win), - TNY_FOLDER (folder_store), - headers); + /* Create header list */ + header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win)); + src_folder = TNY_FOLDER_STORE(tny_header_get_folder(header)); + g_object_unref (header); - /* Transfer current msg */ - if (response == GTK_RESPONSE_OK) { - ModestMailOperation *mail_op; + /* Transfer the message if online or confirmed by the user */ + if (tny_device_is_online (modest_runtime_get_device()) || + (modest_platform_is_network_folderstore(src_folder) && connect_to_get_msg(GTK_WINDOW(win), 1))) { + modest_ui_actions_xfer_messages_from_move_to (dst_folder, MODEST_WINDOW (win)); + } - /* Create mail op */ - mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(win)); - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), - mail_op); - - /* Transfer messages */ - modest_mail_operation_xfer_msgs (mail_op, - headers, - TNY_FOLDER (folder_store), - TRUE, - transfer_msgs_from_viewer_cb, - NULL); - g_object_unref (G_OBJECT (mail_op)); - } - } - - if (header_folder) - g_object_unref (header_folder); - - if (headers) - g_object_unref (headers); - - if (folder_store) - g_object_unref (folder_store); - } - - gtk_widget_destroy (dialog); + g_object_unref (src_folder); } void modest_ui_actions_on_move_to (GtkAction *action, ModestWindow *win) { + GtkWidget *dialog = NULL, *folder_view = NULL, *tree_view = NULL; + gint result = 0; + TnyFolderStore *dst_folder = NULL; + ModestMainWindow *main_window; + g_return_if_fail (MODEST_IS_MAIN_WINDOW (win) || MODEST_IS_MSG_VIEW_WINDOW (win)); - if (MODEST_IS_MAIN_WINDOW (win)) - modest_ui_actions_on_main_window_move_to (action, - MODEST_MAIN_WINDOW (win)); + /* Get the main window if exists */ + if (MODEST_IS_MAIN_WINDOW (win)) + main_window = MODEST_MAIN_WINDOW (win); + else + main_window = + MODEST_MAIN_WINDOW (modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ())); + + /* Get the folder view widget if exists */ + if (main_window) + folder_view = modest_main_window_get_child_widget (main_window, + MODEST_WIDGET_TYPE_FOLDER_VIEW); else - modest_ui_actions_on_msg_view_window_move_to (action, - MODEST_MSG_VIEW_WINDOW (win)); + folder_view = NULL; + + /* Create and run the dialog */ + dialog = create_move_to_dialog (GTK_WINDOW (win), folder_view, &tree_view); + modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (tree_view)); + gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); + result = gtk_dialog_run (GTK_DIALOG(dialog)); + g_object_ref (tree_view); + gtk_widget_destroy (dialog); + + if (result != GTK_RESPONSE_ACCEPT) + 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)); + } + + if (dst_folder) + g_object_unref (dst_folder); } /* @@ -3650,10 +4246,10 @@ do_headers_action (ModestWindow *win, HeadersFunc func, gpointer user_data) { - TnyList *headers_list; - TnyIterator *iter; - TnyHeader *header; - TnyFolder *folder; + TnyList *headers_list = NULL; + TnyIterator *iter = NULL; + TnyHeader *header = NULL; + TnyFolder *folder = NULL; /* Get headers */ headers_list = get_selected_headers (win); @@ -3663,8 +4259,10 @@ do_headers_action (ModestWindow *win, /* Get the folder */ iter = tny_list_create_iterator (headers_list); header = TNY_HEADER (tny_iterator_get_current (iter)); - folder = tny_header_get_folder (header); - g_object_unref (header); + if (header) { + folder = tny_header_get_folder (header); + g_object_unref (header); + } /* Call the function for each header */ while (!tny_iterator_is_done (iter)) { @@ -3730,6 +4328,7 @@ modest_ui_actions_on_settings (GtkAction *action, dialog = modest_platform_get_global_settings_dialog (); gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (win)); + gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); gtk_widget_show_all (dialog); gtk_dialog_run (GTK_DIALOG (dialog)); @@ -3758,9 +4357,9 @@ modest_ui_actions_on_help (GtkAction *action, /* Switch help_id */ if (TNY_IS_FOLDER (folder_store)) { - switch (tny_folder_get_folder_type (TNY_FOLDER (folder_store))) { + switch (modest_tny_folder_guess_folder_type (TNY_FOLDER (folder_store))) { case TNY_FOLDER_TYPE_NORMAL: - help_id = "applications_email_userfolder"; + help_id = "applications_email_managefolders"; break; case TNY_FOLDER_TYPE_INBOX: help_id = "applications_email_inbox"; @@ -3775,11 +4374,13 @@ modest_ui_actions_on_help (GtkAction *action, help_id = "applications_email_drafts"; break; case TNY_FOLDER_TYPE_ARCHIVE: - help_id = "applications_email_archive"; + help_id = "applications_email_managefolders"; break; default: - help_id = NULL; + help_id = "applications_email_managefolders"; } + } else { + help_id = "applications_email_mainview"; } g_object_unref (folder_store); } else { @@ -3823,7 +4424,7 @@ modest_ui_actions_on_email_menu_activated (GtkAction *action, ModestWindow *window) { g_return_if_fail (MODEST_IS_WINDOW (window)); - + /* Update dimmed */ modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules"); }