X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=29c1280e9e3907da1ae74f3a365e8268bc4e2fb8;hp=41b22d3b7ab6aaac82255cd471f1d6ecd55bfee9;hb=9e05b2da2f9d07e25cac56af773aa48e88f698ef;hpb=2b9bc72d79076fed83015e48e76087d7babd781b diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index 41b22d3..29c1280 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -48,6 +48,7 @@ #ifdef MODEST_PLATFORM_MAEMO #include "maemo/modest-osso-state-saving.h" +#include "maemo/modest-maemo-utils.h" #endif /* MODEST_PLATFORM_MAEMO */ #include "widgets/modest-ui-constants.h" @@ -236,25 +237,47 @@ 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)); +} - /* refilter treemodel to hide marked-as-deleted rows */ - if (MODEST_IS_HEADER_VIEW (user_data)) - modest_header_view_refilter (MODEST_HEADER_VIEW (user_data)); +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 { + modest_msg_view_window_select_next_message (win); + } } void @@ -283,7 +306,7 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) 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); @@ -323,44 +346,69 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) message = g_strdup_printf(ngettext("emev_nc_delete_message", "emev_nc_delete_messages", tny_list_get_length(header_list)), desc); - /* Confirmation dialog */ + /* Confirmation dialog */ + printf("DEBUG: %s\n", __FUNCTION__); 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; + + /* 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); + } + } + } + /* Remove each header. If it's a view window header_view == NULL */ do_headers_action (win, headers_action_delete, 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)); - /* 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); @@ -462,9 +510,7 @@ modest_ui_actions_on_accounts (GtkAction *action, ModestWindow *win) } 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)); + modest_maemo_show_dialog_and_forget (GTK_WINDOW (win), account_win); } #else GtkWidget *dialog, *label; @@ -672,8 +718,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; } @@ -756,7 +800,6 @@ cleanup: /* Free */ g_free(account); g_object_unref (parent_win); -/* g_object_unref (msg); */ g_object_unref (folder); } @@ -846,7 +889,7 @@ _modest_ui_actions_open (TnyList *headers, ModestWindow *win) * 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)); + gboolean connected = modest_platform_connect_and_wait (GTK_WINDOW (win), NULL); /* Don't go further if a connection would be necessary but none is available: */ if (!connected) { @@ -1074,7 +1117,8 @@ cleanup: * of them are currently downloaded */ static gboolean -download_uncached_messages (TnyList *header_list, GtkWindow *win) +download_uncached_messages (TnyList *header_list, GtkWindow *win, + gboolean reply_fwd) { TnyIterator *iter; gboolean retval; @@ -1101,16 +1145,20 @@ download_uncached_messages (TnyList *header_list, GtkWindow *win) 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 (reply_fwd) + response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win), + _("emev_nc_include_original")); + else + 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); + retval = modest_platform_connect_and_wait(win, NULL); } } return retval; @@ -1142,7 +1190,7 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) return; /* Check that the messages have been previously downloaded */ - continue_download = download_uncached_messages (header_list, GTK_WINDOW (win)); + continue_download = download_uncached_messages (header_list, GTK_WINDOW (win), TRUE); if (!continue_download) { g_object_unref (header_list); return; @@ -1162,6 +1210,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) @@ -1488,7 +1537,7 @@ modest_ui_actions_on_send_receive (GtkAction *action, ModestWindow *win) 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); @@ -1502,7 +1551,9 @@ 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); } /* Refresh the active account */ @@ -1803,7 +1854,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)); @@ -1840,18 +1890,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); @@ -1860,10 +1911,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); @@ -1879,7 +1926,7 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) 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 @@ -2124,32 +2171,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)); @@ -2160,7 +2195,7 @@ modest_ui_actions_on_new_folder (GtkAction *action, ModestMainWindow *main_windo /* 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); @@ -2175,9 +2210,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); @@ -2185,6 +2220,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; } @@ -2199,6 +2237,21 @@ 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) @@ -2242,6 +2295,8 @@ modest_ui_actions_on_rename_folder (GtkAction *action, return; folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view)); + if (!folder) + return; /* Offer the connection dialog if necessary: */ if (!modest_platform_connect_and_wait_if_network_folderstore (NULL, folder)) { @@ -2250,7 +2305,7 @@ modest_ui_actions_on_rename_folder (GtkAction *action, } - if (folder && TNY_IS_FOLDER (folder)) { + if (TNY_IS_FOLDER (folder)) { gchar *folder_name; gint response; const gchar *current_name; @@ -2273,7 +2328,13 @@ modest_ui_actions_on_rename_folder (GtkAction *action, mail_op); modest_header_view_clear (MODEST_HEADER_VIEW (header_view)); + + modest_folder_view_select_folder (MODEST_FOLDER_VIEW(folder_view), + TNY_FOLDER(folder), TRUE); + + modest_header_view_clear ((ModestHeaderView *) header_view); + modest_mail_operation_rename_folder (mail_op, TNY_FOLDER (folder), (const gchar *) folder_name); @@ -2281,8 +2342,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 @@ -2304,7 +2365,7 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) gint response; gchar *message; - g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window)); + 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); @@ -2584,6 +2645,8 @@ modest_ui_actions_on_copy (GtkAction *action, gtk_clipboard_set_text (clipboard, gtk_label_get_text (GTK_LABEL (focused_widget)), -1); } else if (GTK_IS_EDITABLE (focused_widget)) { gtk_editable_copy_clipboard (GTK_EDITABLE(focused_widget)); + } else if (GTK_IS_HTML (focused_widget)) { + gtk_html_copy (GTK_HTML (focused_widget)); } else if (GTK_IS_TEXT_VIEW (focused_widget)) { GtkTextBuffer *buffer; buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused_widget)); @@ -2607,7 +2670,7 @@ modest_ui_actions_on_copy (GtkAction *action, /* Check that the messages have been previously downloaded */ gboolean continue_download = TRUE; if (ask) - continue_download = download_uncached_messages (header_list, GTK_WINDOW (window)); + continue_download = download_uncached_messages (header_list, GTK_WINDOW (window), FALSE); if (continue_download) modest_header_view_copy_selection (MODEST_HEADER_VIEW (focused_widget)); g_object_unref (header_list); @@ -3015,16 +3078,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 @@ -3086,22 +3145,32 @@ modest_ui_actions_on_check_names (GtkAction *action, ModestMsgEditWindow *window modest_msg_edit_window_check_names (window); } +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)); +} 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), GTK_STOCK_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 (GTK_STOCK_NEW); + gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->action_area), new_button, FALSE, FALSE, 0); + gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT); /* Create scrolled window */ scroll = gtk_scrolled_window_new (NULL, NULL); @@ -3112,6 +3181,8 @@ create_move_to_dialog (ModestWindow *win, /* Create folder view */ *tree_view = modest_platform_create_folder_view (NULL); + 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 @@ -3123,16 +3194,16 @@ create_move_to_dialog (ModestWindow *win, modest_folder_view_update_model (MODEST_FOLDER_VIEW (*tree_view), TNY_ACCOUNT_STORE (modest_runtime_get_account_store ())); + 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; } @@ -3220,22 +3291,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 @@ -3293,10 +3356,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 */ @@ -3348,6 +3414,7 @@ open_msg_for_purge_cb (ModestMailOperation *mail_op, g_object_unref (part); tny_iterator_next (iter); } + modest_window_mgr_unregister_header (mgr, header); g_object_unref (iter); g_object_unref (parts); @@ -3410,64 +3477,90 @@ modest_ui_actions_on_main_window_remove_attachments (GtkAction *action, g_object_unref (header_list); } +/** + * 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_xfer_messages_from_move_to (TnyFolderStore *dst_folder, + ModestWindow *win) +{ + TnyList *headers = NULL; + gint response = 0; + + 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 selected headers */ + headers = get_selected_headers (MODEST_WINDOW (win)); + + /* Ask for user confirmation */ + response = msgs_move_to_confirmation (GTK_WINDOW (win), + TNY_FOLDER (dst_folder), + headers); + + /* 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_xfer_msgs (mail_op, + headers, + TNY_FOLDER (dst_folder), + TRUE, + (MODEST_IS_MSG_VIEW_WINDOW (win)) ? transfer_msgs_from_viewer_cb : NULL, + NULL); + + g_object_unref (G_OBJECT (mail_op)); + } + g_object_unref (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) { - GtkWidget *dialog = NULL, *folder_view = NULL, *tree_view = NULL; GtkWidget *header_view = NULL; - gint result = 0; - TnyFolderStore *folder_store = NULL; ModestMailOperation *mail_op = NULL; + TnyFolderStore *src_folder; 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)); + /* Get the source folder */ + 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); - } - - return; - } - - /* Get header view */ - header_view = modest_main_window_get_child_widget (win, - MODEST_WIDGET_TYPE_HEADER_VIEW); - - /* Create and run the dialog */ - dialog = create_move_to_dialog (MODEST_WINDOW (win), folder_view, &tree_view); - modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (tree_view)); - result = gtk_dialog_run (GTK_DIALOG(dialog)); - g_object_ref (tree_view); - - /* We do this to save an indentation level ;-) */ - if (result != GTK_RESPONSE_ACCEPT) - goto end; - - folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (tree_view)); - - if (TNY_IS_ACCOUNT (folder_store) && - !MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (folder_store)) + if (!modest_platform_connect_and_wait_if_network_folderstore (GTK_WINDOW (win), + src_folder)) goto end; - /* Offer the connection dialog if necessary: */ - if (!modest_platform_connect_and_wait_if_network_folderstore (GTK_WINDOW (win), folder_store)) { - goto end; - } + /* Get header view */ + 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)) { + + /* Allow only to transfer folders to the local root folder */ + if (TNY_IS_ACCOUNT (dst_folder) && + !MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (dst_folder)) + goto end; /* Clean folder on header view before moving it */ modest_header_view_clear (MODEST_HEADER_VIEW (header_view)); @@ -3475,64 +3568,29 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action, if (TNY_IS_FOLDER (src_folder)) { 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_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), - folder_store, + dst_folder, 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; - - /* TODO: Check for connection if the headers are on a network account. */ - headers = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (header_view)); - - /* Ask for user confirmation */ - response = msgs_move_to_confirmation (GTK_WINDOW (win), - TNY_FOLDER (folder_store), - headers); - - /* 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); - - modest_mail_operation_xfer_msgs (mail_op, - headers, - TNY_FOLDER (folder_store), - TRUE, - NULL, - NULL); - - g_object_unref (G_OBJECT (mail_op)); - } - g_object_unref (headers); - } + } else if (gtk_widget_is_focus (header_view)) { + /* 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); } @@ -3542,96 +3600,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); + TnyFolder *src_folder; - /* 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); - - /* Ask user for confirmation. MSG-NOT404 */ - response = msgs_move_to_confirmation (GTK_WINDOW (win), - TNY_FOLDER (folder_store), - headers); - - /* Transfer current msg */ - if (response == GTK_RESPONSE_OK) { - ModestMailOperation *mail_op; + /* Create header list */ + header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win)); + src_folder = tny_header_get_folder(header); + g_object_unref (header); - /* 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); + /* Transfer the message */ + if (modest_platform_connect_and_wait_if_network_folderstore (NULL, TNY_FOLDER_STORE (src_folder))) + modest_ui_actions_xfer_messages_from_move_to (dst_folder, MODEST_WINDOW (win)); - 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 - modest_ui_actions_on_msg_view_window_move_to (action, - MODEST_MSG_VIEW_WINDOW (win)); + 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 + 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)); + 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)); + /* Offer the connection dialog if necessary: */ + if (modest_platform_connect_and_wait_if_network_folderstore (GTK_WINDOW (win), + dst_folder)) { + + /* 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); } /* @@ -3751,9 +3791,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"; @@ -3768,11 +3808,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 {