X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=d69a7962525f183e5fbd865b17d5620589596d8f;hp=ddf93685f631ca9e5d672f40f393e28950979ba9;hb=5619278be034c3032ce89fc8ce0a2d52ef351e7b;hpb=703965f6f52fab28c9762f1b5603c6feeec5a680 diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index ddf9368..d69a796 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -45,10 +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" @@ -99,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 @@ -130,19 +139,49 @@ 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); -static void -run_account_setup_wizard (ModestWindow *win) +static gint +msgs_move_to_confirmation (GtkWindow *win, + TnyFolder *dest_folder, + gboolean delete, + TnyList *headers); + + +/* 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) { + gboolean result = FALSE; ModestEasysetupWizardDialog *wizard; - - g_return_if_fail (MODEST_IS_WINDOW(win)); + + if (!win) + win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()); + + g_return_val_if_fail (MODEST_IS_WINDOW(win), FALSE); 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)); + + return result; } @@ -167,6 +206,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); @@ -260,10 +301,6 @@ headers_action_delete (TnyHeader *header, 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, @@ -276,7 +313,10 @@ void modest_ui_actions_refresh_message_window_after_delete (ModestMsgViewWindow* 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); + 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); + } } } @@ -303,9 +343,11 @@ 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 are already opened, or in the process of being opened */ if (MODEST_IS_MAIN_WINDOW (win)) { gboolean found; @@ -314,8 +356,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); @@ -339,8 +384,11 @@ 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", @@ -360,6 +408,8 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) GList *sel_list = NULL, *tmp = NULL; GtkTreeRowReference *row_reference = NULL; GtkTreePath *next_path = NULL; + TnyFolder *folder = NULL; + GError *err = NULL; /* Find last selected row */ if (MODEST_IS_MAIN_WINDOW (win)) { @@ -379,6 +429,9 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) /* Remove each header. If it's a view window header_view == NULL */ do_headers_action (win, headers_action_delete, header_view); + /* refresh the header view (removing marked-as-deleted)*/ + modest_header_view_refilter (MODEST_HEADER_VIEW(header_view)); + if (MODEST_IS_MSG_VIEW_WINDOW (win)) { modest_ui_actions_refresh_message_window_after_delete (MODEST_MSG_VIEW_WINDOW (win)); @@ -400,6 +453,30 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) gtk_tree_row_reference_free (row_reference); } + /* Get folder from first header and sync it */ + iter = tny_list_create_iterator (header_list); + header = TNY_HEADER (tny_iterator_get_current (iter)); + folder = tny_header_get_folder (header); + if (TNY_IS_CAMEL_IMAP_FOLDER (folder)) +/* tny_folder_sync_async(folder, FALSE, NULL, NULL, NULL); /\* FALSE --> don't expunge *\/ */ + tny_folder_sync (folder, FALSE, &err); /* FALSE --> don't expunge */ + else if (TNY_IS_CAMEL_POP_FOLDER (folder)) +/* tny_folder_sync_async(folder, FALSE, NULL, NULL, NULL); /\* TRUE --> dont expunge *\/ */ + tny_folder_sync (folder, TRUE, &err); /* TRUE --> expunge */ + else + /* local folders */ +/* tny_folder_sync_async(folder, TRUE, NULL, NULL, NULL); /\* TRUE --> expunge *\/ */ + tny_folder_sync (folder, TRUE, &err); /* TRUE --> expunge */ + + if (err != NULL) { + printf ("DEBUG: %s: Error: code=%d, text=%s\n", __FUNCTION__, err->code, err->message); + g_error_free(err); + } + + g_object_unref (header); + g_object_unref (iter); + g_object_unref (folder); + /* Update toolbar dimming state */ modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window)); @@ -466,6 +543,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)) { */ @@ -505,11 +583,16 @@ 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)); + + /* 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 @@ -606,8 +689,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 ()); @@ -632,16 +716,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"); @@ -656,8 +741,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); @@ -728,23 +813,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); @@ -767,17 +855,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); } @@ -836,11 +922,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 @@ -848,15 +932,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); @@ -869,16 +954,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); @@ -888,14 +971,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; } } @@ -903,35 +997,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, @@ -939,45 +1023,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 @@ -1045,13 +1100,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; @@ -1081,7 +1136,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); @@ -1103,7 +1158,6 @@ cleanup: if (account) g_object_unref (G_OBJECT (account)); /* g_object_unref (msg); */ - g_object_unref (header); free_reply_forward_helper (rf_helper); } @@ -1117,8 +1171,8 @@ cleanup: * of them are currently downloaded */ static gboolean -download_uncached_messages (TnyList *header_list, GtkWindow *win, - gboolean reply_fwd) +download_uncached_messages (TnyList *header_list, + GtkWindow *win) { TnyIterator *iter; gboolean retval; @@ -1127,16 +1181,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,21 +1196,20 @@ download_uncached_messages (TnyList *header_list, GtkWindow *win, /* Ask for user permission to download the messages */ retval = TRUE; if (uncached_messages > 0) { - GtkResponseType response; - if (reply_fwd) - response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win), - _("emev_nc_include_original")); - else - response = + gboolean download = TRUE; + if (!tny_device_is_online (modest_runtime_get_device())) { + GtkResponseType 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 (response == GTK_RESPONSE_CANCEL) download = FALSE; + } + if (download) { /* 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); + } else { + retval = FALSE; } } return retval; @@ -1175,31 +1226,36 @@ 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; + reply_forward_type = + modest_conf_get_int (modest_runtime_get_conf (), + (action == ACTION_FORWARD) ? MODEST_CONF_FORWARD_TYPE : MODEST_CONF_REPLY_TYPE, + NULL); + /* Check that the messages have been previously downloaded */ - continue_download = download_uncached_messages (header_list, GTK_WINDOW (win), TRUE); + do_retrieve = (action == ACTION_FORWARD) || (reply_forward_type != MODEST_TNY_MSG_REPLY_TYPE_CITE); + if (do_retrieve) + continue_download = download_uncached_messages (header_list, GTK_WINDOW (win)); 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 @@ -1227,42 +1283,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 */ @@ -1300,14 +1363,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 (); } @@ -1344,8 +1410,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); @@ -1357,10 +1426,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)); + - modest_platform_on_new_msg (); + 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); + } + + /* Notify new messages have been downloaded */ + if (new_messages > 0) + modest_platform_on_new_msg (); } /* @@ -1409,7 +1499,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 */ @@ -1508,22 +1598,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)) { @@ -1555,6 +1634,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); @@ -1602,6 +1699,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; @@ -1671,6 +1782,9 @@ folder_refreshed_cb (ModestMailOperation *mail_op, { ModestMainWindow *win = NULL; GtkWidget *header_view; + TnyFolder *current_folder; + gboolean folder_empty = TRUE; + gboolean all_marked_as_deleted = TRUE; g_return_if_fail (TNY_IS_FOLDER (folder)); @@ -1678,8 +1792,19 @@ 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) { + 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); @@ -1802,7 +1927,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); @@ -1922,11 +2048,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 @@ -1938,8 +2064,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); @@ -1954,25 +2082,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; @@ -2153,7 +2270,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 @@ -2171,33 +2288,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)); @@ -2205,10 +2309,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); @@ -2223,9 +2342,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); @@ -2233,13 +2352,8 @@ modest_ui_actions_on_new_folder (GtkAction *action, ModestMainWindow *main_windo parent_folder, (const gchar *) folder_name); if (new_folder) { - if (main_window) { - folder_view = modest_main_window_get_child_widget (main_window, - MODEST_WIDGET_TYPE_FOLDER_VIEW); - if (folder_view) - modest_folder_view_select_folder (MODEST_FOLDER_VIEW(folder_view), - new_folder, TRUE); - } + modest_folder_view_select_folder (MODEST_FOLDER_VIEW(folder_view), + new_folder, TRUE); g_object_unref (new_folder); finished = TRUE; @@ -2255,11 +2369,26 @@ 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; @@ -2271,9 +2400,8 @@ modest_ui_actions_rename_folder_error_handler (ModestMailOperation *mail_op, message = _("!!! FIXME: Unable to rename"); } - /* 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 @@ -2321,11 +2449,10 @@ modest_ui_actions_on_rename_folder (GtkAction *action, ModestMailOperation *mail_op; 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); @@ -2335,7 +2462,6 @@ modest_ui_actions_on_rename_folder (GtkAction *action, 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, @@ -2418,9 +2544,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 @@ -2431,6 +2563,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, @@ -2588,6 +2741,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; @@ -2615,18 +2770,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)) { @@ -2646,34 +2804,46 @@ 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 */ gboolean continue_download = TRUE; if (ask) - continue_download = download_uncached_messages (header_list, GTK_WINDOW (window), FALSE); + continue_download = download_uncached_messages (header_list, GTK_WINDOW (window)); if (continue_download) modest_header_view_copy_selection (MODEST_HEADER_VIEW (focused_widget)); g_object_unref (header_list); @@ -2727,6 +2897,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) @@ -2739,12 +2935,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; @@ -2762,30 +2987,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, @@ -2971,6 +3216,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)); @@ -2990,6 +3236,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)); @@ -3022,8 +3269,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); @@ -3145,9 +3394,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, @@ -3155,15 +3410,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); @@ -3174,6 +3433,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 @@ -3191,9 +3452,10 @@ create_move_to_dialog (GtkWindow *win, /* 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)); + gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 300); return dialog; } @@ -3209,14 +3471,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); @@ -3235,21 +3502,26 @@ has_retrieved_msgs (TnyList *list) static 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; + /* If the destination is a local folder (or MMC folder )*/ + if (!modest_tny_folder_is_remote_folder (dest_folder)) { +/* if (modest_tny_folder_is_local_folder (dest_folder)) { */ + 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 */ @@ -3257,21 +3529,27 @@ msgs_move_to_confirmation (GtkWindow *win, 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)) +/* if (!modest_tny_folder_is_local_folder (src_folder)) { */ + if (modest_tny_folder_is_remote_folder (src_folder)) { + const gchar *message = NULL; + gboolean cached = has_retrieved_msgs (headers); + if (cached) 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 (cached && !delete) + response = GTK_RESPONSE_OK; + else + response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win), + (const gchar *) message); } + g_object_unref (src_folder); } + return response; } @@ -3364,12 +3642,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); } @@ -3384,8 +3666,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); } @@ -3401,7 +3687,14 @@ 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); @@ -3477,6 +3770,9 @@ modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_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), @@ -3485,12 +3781,29 @@ modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder, return; } + dst_account = tny_folder_get_account (TNY_FOLDER (dst_folder)); + proto_str = tny_account_get_proto (dst_account); + dst_is_pop = (modest_protocol_info_get_transport_store_protocol (proto_str) == + MODEST_PROTOCOL_STORE_POP); + g_object_unref (dst_account); + /* Get selected headers */ headers = get_selected_headers (MODEST_WINDOW (win)); + 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; + } + /* Ask for user confirmation */ response = msgs_move_to_confirmation (GTK_WINDOW (win), TNY_FOLDER (dst_folder), + TRUE, headers); /* Transfer messages */ @@ -3637,6 +3950,7 @@ modest_ui_actions_on_move_to (GtkAction *action, /* 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); @@ -3673,10 +3987,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); @@ -3686,8 +4000,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)) { @@ -3753,6 +4069,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)); @@ -3848,7 +4165,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"); }