X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=2f12ad980bce1f9cc33d06cf8d65bc322af8d7d9;hp=36e3a9d98d8c34a80e365de6b912d85fb502a796;hb=1b2faee9be271736a69c49191440bb981c577dde;hpb=f1dd26f4a1024e2d10f373fb5b5f8655ebad0fdf diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index 36e3a9d..2f12ad9 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -49,6 +49,7 @@ #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" @@ -99,6 +100,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 @@ -130,6 +136,9 @@ static void _on_send_receive_progress_changed (ModestMailOperation *mail_op ModestMailOperationState *state, gpointer user_data); +static gboolean +download_uncached_messages (TnyList *header_list, GtkWindow *win, + gboolean reply_fwd); static void @@ -237,25 +246,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)); +} + +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)); */ +} - /* 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 @@ -284,7 +315,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); @@ -292,8 +323,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); @@ -317,14 +351,18 @@ 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 */ + printf("DEBUG: %s\n", __FUNCTION__); response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win), message); @@ -357,13 +395,7 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) 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 (); @@ -449,6 +481,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)) { */ @@ -701,8 +734,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; } @@ -713,17 +744,18 @@ 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); @@ -785,7 +817,6 @@ cleanup: /* Free */ g_free(account); g_object_unref (parent_win); -/* g_object_unref (msg); */ g_object_unref (folder); } @@ -822,11 +853,9 @@ _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; /* Look if we already have a message view for each header. If true, then remove the header from the list of headers to @@ -834,15 +863,16 @@ _modest_ui_actions_open (TnyList *headers, ModestWindow *win) 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); @@ -855,16 +885,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); @@ -874,14 +902,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; } } @@ -889,35 +928,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, @@ -925,45 +954,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 @@ -1103,7 +1103,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; @@ -1113,16 +1114,14 @@ download_uncached_messages (TnyList *header_list, GtkWindow *win, 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); @@ -1144,7 +1143,7 @@ download_uncached_messages (TnyList *header_list, GtkWindow *win, 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; @@ -1196,6 +1195,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) @@ -1235,17 +1235,21 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) header = TNY_HEADER (tny_iterator_get_current (iter)); g_object_unref (iter); - modest_mail_operation_get_msg (mail_op, + if (header) { + modest_mail_operation_get_msg (mail_op, header, reply_forward_cb, rf_helper); -/* modest_mail_operation_get_msgs_full (mail_op, */ +/* 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); } @@ -1329,8 +1333,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); @@ -1493,22 +1500,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)) { @@ -1540,6 +1536,24 @@ modest_ui_actions_on_send_receive (GtkAction *action, ModestWindow *win) 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); @@ -1656,6 +1670,7 @@ folder_refreshed_cb (ModestMailOperation *mail_op, { ModestMainWindow *win = NULL; GtkWidget *header_view; + TnyFolder *current_folder; g_return_if_fail (TNY_IS_FOLDER (folder)); @@ -1663,6 +1678,13 @@ 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__); @@ -1787,7 +1809,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); @@ -1839,7 +1862,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)); @@ -1876,18 +1898,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); @@ -1896,10 +1919,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); @@ -1911,11 +1930,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 @@ -2142,7 +2161,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 @@ -2160,32 +2179,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)); @@ -2196,7 +2203,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); @@ -2211,9 +2218,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); @@ -2221,6 +2228,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; } @@ -2235,6 +2245,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) @@ -2278,6 +2303,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)) { @@ -2286,7 +2313,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; @@ -2309,7 +2336,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); @@ -2317,8 +2350,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 @@ -2340,7 +2373,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); @@ -2403,6 +2436,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, @@ -2560,6 +2614,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; @@ -2587,18 +2643,21 @@ 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)); } else if (MODEST_IS_FOLDER_VIEW (focused_widget)) { @@ -2618,28 +2677,40 @@ modest_ui_actions_on_copy (GtkAction *action, 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); + + gboolean ask = FALSE; + if (header) { + 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 */ + 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 */ @@ -2699,6 +2770,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) @@ -2711,12 +2808,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; @@ -2994,8 +3120,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); @@ -3117,9 +3245,15 @@ 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)); +} static GtkWidget* create_move_to_dialog (GtkWindow *win, @@ -3127,15 +3261,19 @@ create_move_to_dialog (GtkWindow *win, 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); @@ -3146,6 +3284,8 @@ create_move_to_dialog (GtkWindow *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 @@ -3157,18 +3297,16 @@ create_move_to_dialog (GtkWindow *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); + 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; } @@ -3186,12 +3324,16 @@ has_retrieved_msgs (TnyList *list) iter = tny_list_create_iterator (list); 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_PARTIAL)) + found = TRUE; + + g_object_unref (header); + } if (!found) tny_iterator_next (iter); @@ -3216,15 +3358,18 @@ msgs_move_to_confirmation (GtkWindow *win, /* If the destination is a local folder */ if (modest_tny_folder_is_local_folder (dest_folder)) { - TnyFolder *src_folder; - TnyIterator *iter; - TnyHeader *header; + 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)); - src_folder = tny_header_get_folder (header); - g_object_unref (header); + if (header) { + src_folder = tny_header_get_folder (header); + g_object_unref (header); + } + g_object_unref (iter); /* if no src_folder, message may be an attahcment */ @@ -3245,8 +3390,10 @@ msgs_move_to_confirmation (GtkWindow *win, response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win), (const gchar *) message); } + g_object_unref (src_folder); } + return response; } @@ -3256,22 +3403,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 @@ -3329,10 +3468,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 */ @@ -3344,12 +3486,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); } @@ -3364,8 +3510,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); } @@ -3381,9 +3531,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); @@ -3446,65 +3604,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 (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)); - modest_folder_view_show_non_move_folders(MODEST_FOLDER_VIEW (tree_view), TRUE); - g_object_ref (tree_view); - - /* We do this to save an indentation level ;-) */ - if (result != GTK_RESPONSE_ACCEPT) + if (!modest_platform_connect_and_wait_if_network_folderstore (GTK_WINDOW (win), + src_folder)) 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)) - 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)); @@ -3512,64 +3695,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); } @@ -3579,97 +3727,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; + TnyFolder *src_folder; - /* Create and run the dialog */ - dialog = create_move_to_dialog (GTK_WINDOW (win), folder_view, &tree_view); - result = gtk_dialog_run (GTK_DIALOG(dialog)); - modest_folder_view_show_non_move_folders(MODEST_FOLDER_VIEW (tree_view), TRUE); - - 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); - - /* 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); } /* @@ -3681,10 +3810,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); @@ -3694,8 +3823,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)) { @@ -3789,9 +3920,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"; @@ -3806,10 +3937,10 @@ 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 = "applications_email_mainview"; + help_id = "applications_email_managefolders"; } } else { help_id = "applications_email_mainview";