X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=e4798cf11882c3646ce42d31ec937eebc5fe317a;hp=400233f0378ceacbcc801824890cb46f9344986a;hb=9a50aa1fcb88365c321552e395232846dfe06ea0;hpb=483e890df6e4e687e4f14b2174701544c582b1a2 diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index 400233f..e4798cf 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -104,8 +104,8 @@ typedef struct _ReplyForwardHelper { } ReplyForwardHelper; typedef struct _MoveToHelper { - ModestMailOperation *mail_op; - TnyFolder *folder; + GtkTreeRowReference *reference; + GtkWidget *banner; } MoveToHelper; typedef struct _PasteAsAttachmentHelper { @@ -140,45 +140,89 @@ static void folder_refreshed_cb (ModestMailOperation *mail_op, TnyFolder *folder, gpointer user_data); -static void _on_send_receive_progress_changed (ModestMailOperation *mail_op, - ModestMailOperationState *state, - gpointer user_data); +static void on_send_receive_finished (ModestMailOperation *mail_op, + gpointer user_data); + +static gint header_list_count_uncached_msgs (TnyList *header_list); + +static gboolean connect_to_get_msg (ModestWindow *win, + gint num_of_uncached_msgs, + TnyAccount *account); + +static gboolean remote_folder_is_pop (const TnyFolderStore *folder); + +static gboolean msgs_already_deleted_from_server ( TnyList *headers, + const TnyFolderStore *src_folder); + + +/* + * This function checks whether a TnyFolderStore is a pop account + */ +static gboolean +remote_folder_is_pop (const TnyFolderStore *folder) +{ + const gchar *proto = NULL; + TnyAccount *account = NULL; + + g_return_val_if_fail (TNY_IS_FOLDER_STORE(folder), FALSE); + + if (TNY_IS_ACCOUNT (folder)) { + account = TNY_ACCOUNT(folder); + g_object_ref(account); + } else if (TNY_IS_FOLDER (folder)) { + account = tny_folder_get_account(TNY_FOLDER(folder)); + } + + proto = tny_account_get_proto(account); + g_object_unref (account); + + return proto && + (modest_protocol_info_get_transport_store_protocol (proto) == MODEST_PROTOCOL_STORE_POP); +} + +/* + * This functions checks whether if a list of messages are already + * deleted from the server: that is, if the server is a POP account + * and all messages are already cached. + */ +static gboolean +msgs_already_deleted_from_server (TnyList *headers, const TnyFolderStore *src_folder) +{ + g_return_val_if_fail (TNY_IS_FOLDER_STORE(src_folder), FALSE); + g_return_val_if_fail (TNY_IS_LIST(headers), FALSE); -static gint header_list_count_uncached_msgs ( - TnyList *header_list, - GtkWindow *win); -static gboolean connect_to_get_msg ( - GtkWindow *win, - gint num_of_uncached_msgs); + gboolean src_is_pop = remote_folder_is_pop (src_folder); + gint uncached_msgs = header_list_count_uncached_msgs (headers); + return (src_is_pop && !uncached_msgs); +} +/* FIXME: this should be merged with the similar code in modest-account-view-window */ /* 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) +modest_ui_actions_run_account_setup_wizard (ModestWindow *win) { - gboolean result = FALSE; - GtkDialog *wizard; - - wizard = modest_window_mgr_get_easysetup_dialog - (modest_runtime_get_window_mgr()); - if (wizard) { - /* old wizard is active already; present it and - * act as if the user cancelled the non-existing - * new one + gboolean result = FALSE; + GtkWindow *dialog, *wizard; + gint dialog_response; + + /* Show the easy-setup wizard: */ + dialog = modest_window_mgr_get_modal (modest_runtime_get_window_mgr()); + if (dialog && MODEST_IS_EASYSETUP_WIZARD_DIALOG(dialog)) { + /* old wizard is active already; */ - printf ("wizard already active\n"); + gtk_window_present (GTK_WINDOW(dialog)); return FALSE; - } else { - /* there is no such wizard yet */ - wizard = GTK_DIALOG(modest_easysetup_wizard_dialog_new ()); - modest_window_mgr_set_easysetup_dialog - (modest_runtime_get_window_mgr(), GTK_DIALOG(wizard)); - } - + } + + /* there is no such wizard yet */ + wizard = GTK_WINDOW (modest_easysetup_wizard_dialog_new ()); + modest_window_mgr_set_modal (modest_runtime_get_window_mgr(), wizard); + /* always present a main window in the background * we do it here, so we cannot end up with to wizards (as this * function might be called in modest_window_mgr_get_main_window as well */ @@ -188,28 +232,19 @@ modest_run_account_setup_wizard (ModestWindow *win) /* make sure the mainwindow is visible */ gtk_widget_show_all (GTK_WIDGET(win)); gtk_window_present (GTK_WINDOW(win)); - - gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (win)); + dialog_response = gtk_dialog_run (GTK_DIALOG (wizard)); + gtk_widget_destroy (GTK_WIDGET (wizard)); + if (gtk_events_pending ()) + gtk_main_iteration (); - /* 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) + if (dialog_response == GTK_RESPONSE_CANCEL) { result = FALSE; - else { + } else { /* Check whether an account was created: */ result = modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE); } - gtk_widget_destroy (GTK_WIDGET (wizard)); - - /* clear it from the window mgr */ - modest_window_mgr_set_easysetup_dialog - (modest_runtime_get_window_mgr(), NULL); - return result; } @@ -257,7 +292,7 @@ get_selected_headers (ModestWindow *win) GtkWidget *header_view; header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win), - MODEST_WIDGET_TYPE_HEADER_VIEW); + MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); return modest_header_view_get_selected_headers (MODEST_HEADER_VIEW(header_view)); } else if (MODEST_IS_MSG_VIEW_WINDOW (win)) { @@ -278,6 +313,35 @@ get_selected_headers (ModestWindow *win) return NULL; } +static GtkTreeRowReference * +get_next_after_selected_headers (ModestHeaderView *header_view) +{ + GtkTreeSelection *sel; + GList *selected_rows, *node; + GtkTreePath *path; + GtkTreeRowReference *result; + GtkTreeModel *model; + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)); + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (header_view)); + selected_rows = gtk_tree_selection_get_selected_rows (sel, NULL); + + if (selected_rows == NULL) + return NULL; + + node = g_list_last (selected_rows); + path = gtk_tree_path_copy ((GtkTreePath *) node->data); + gtk_tree_path_next (path); + + result = gtk_tree_row_reference_new (model, path); + + gtk_tree_path_free (path); + g_list_foreach (selected_rows, (GFunc) gtk_tree_path_free, NULL); + g_list_free (selected_rows); + + return result; +} + static void headers_action_mark_as_read (TnyHeader *header, ModestWindow *win, @@ -314,8 +378,7 @@ headers_action_mark_as_unread (TnyHeader *header, void modest_do_message_delete (TnyHeader *header, ModestWindow *win) { ModestMailOperation *mail_op = NULL; - mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_DELETE, - win ? G_OBJECT(win) : NULL); + mail_op = modest_mail_operation_new (win ? G_OBJECT(win) : NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); @@ -331,8 +394,7 @@ void modest_do_message_delete (TnyHeader *header, ModestWindow *win) void modest_do_messages_delete (TnyList *headers, ModestWindow *win) { ModestMailOperation *mail_op = NULL; - mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_DELETE, - win ? G_OBJECT(win) : NULL); + mail_op = modest_mail_operation_new (win ? G_OBJECT(win) : NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); @@ -341,29 +403,19 @@ void modest_do_messages_delete (TnyList *headers, ModestWindow *win) 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); */ - -/* } */ - /** 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) +void +modest_ui_actions_refresh_message_window_after_delete (ModestMsgViewWindow* win) { /* Close msg view window or select next */ if (modest_msg_view_window_last_message_selected (win) && modest_msg_view_window_first_message_selected (win)) { modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (win)); - } else { - if (!modest_msg_view_window_select_next_message (win)) { - gboolean ret_value; - g_signal_emit_by_name (G_OBJECT (win), "delete-event", NULL, &ret_value); - } + } else if (!modest_msg_view_window_select_next_message (win)) { + gboolean ret_value; + g_signal_emit_by_name (G_OBJECT (win), "delete-event", NULL, &ret_value); } } @@ -385,7 +437,7 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) if (MODEST_IS_MAIN_WINDOW (win)) { header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), - MODEST_WIDGET_TYPE_HEADER_VIEW); + MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); if (!gtk_widget_is_focus (header_view)) return; } @@ -397,31 +449,30 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) /* Check if any of the headers are already opened, or in the process of being opened */ if (MODEST_IS_MAIN_WINDOW (win)) { - gboolean found; + gint opened_headers = 0; + iter = tny_list_create_iterator (header_list); - found = FALSE; mgr = modest_runtime_get_window_mgr (); - while (!tny_iterator_is_done (iter) && !found) { + while (!tny_iterator_is_done (iter)) { header = TNY_HEADER (tny_iterator_get_current (iter)); if (header) { - found = modest_window_mgr_find_registered_header (mgr, header, NULL); + if (modest_window_mgr_find_registered_header (mgr, header, NULL)) + opened_headers++; g_object_unref (header); } - tny_iterator_next (iter); } g_object_unref (iter); - if (found) { - gchar *num, *msg; + if (opened_headers > 0) { + gchar *msg; - num = g_strdup_printf ("%d", tny_list_get_length (header_list)); - msg = g_strdup_printf (_("mcen_nc_unable_to_delete_n_messages"), num); + msg = g_strdup_printf (_("mcen_nc_unable_to_delete_n_messages"), + opened_headers); modest_platform_run_information_dialog (GTK_WINDOW (win), (const gchar *) msg); g_free (msg); - g_free (num); g_object_unref (header_list); return; } @@ -452,8 +503,10 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) GtkTreeModel *model = NULL; GtkTreeSelection *sel = NULL; GList *sel_list = NULL, *tmp = NULL; - GtkTreeRowReference *row_reference = NULL; + GtkTreeRowReference *next_row_reference = NULL; + GtkTreeRowReference *prev_row_reference = NULL; GtkTreePath *next_path = NULL; + GtkTreePath *prev_path = NULL; GError *err = NULL; /* Find last selected row */ @@ -463,10 +516,14 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) sel_list = gtk_tree_selection_get_selected_rows (sel, &model); for (tmp=sel_list; tmp; tmp=tmp->next) { if (tmp->next == NULL) { + prev_path = gtk_tree_path_copy((GtkTreePath *) tmp->data); next_path = gtk_tree_path_copy((GtkTreePath *) tmp->data); + + gtk_tree_path_prev (prev_path); gtk_tree_path_next (next_path); - row_reference = gtk_tree_row_reference_new (model, next_path); - gtk_tree_path_free (next_path); + + prev_row_reference = gtk_tree_row_reference_new (model, prev_path); + next_row_reference = gtk_tree_row_reference_new (model, next_path); } } } @@ -475,17 +532,13 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) modest_window_disable_dimming (MODEST_WINDOW(win)); /* Remove each header. If it's a view window header_view == NULL */ -/* do_headers_action (win, headers_action_delete, header_view); */ modest_do_messages_delete (header_list, win); - /* Enable window dimming management */ - gtk_tree_selection_unselect_all (sel); + if (sel != NULL) { + gtk_tree_selection_unselect_all (sel); + } modest_window_enable_dimming (MODEST_WINDOW(win)); - - /* FIXME: May be folder_monitor will also refilter treemode on EXPUNGE changes ? */ - /* refresh the header view (removing marked-as-deleted) */ -/* modest_header_view_refilter (MODEST_HEADER_VIEW(header_view)); */ if (MODEST_IS_MSG_VIEW_WINDOW (win)) { modest_ui_actions_refresh_message_window_after_delete (MODEST_MSG_VIEW_WINDOW (win)); @@ -498,14 +551,24 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) /* Move cursor to next row */ main_window = win; - /* Select next row */ - if (gtk_tree_row_reference_valid (row_reference)) { - next_path = gtk_tree_row_reference_get_path (row_reference); + /* Select next or previous row */ + if (gtk_tree_row_reference_valid (next_row_reference)) { +/* next_path = gtk_tree_row_reference_get_path (row_reference); */ gtk_tree_selection_select_path (sel, next_path); - gtk_tree_path_free (next_path); } - if (row_reference != NULL) - gtk_tree_row_reference_free (row_reference); + else if (gtk_tree_row_reference_valid (prev_row_reference)) { + gtk_tree_selection_select_path (sel, prev_path); + } + + /* Free */ + if (next_row_reference != NULL) + gtk_tree_row_reference_free (next_row_reference); + if (next_path != NULL) + gtk_tree_path_free (next_path); + if (prev_row_reference != NULL) + gtk_tree_row_reference_free (prev_row_reference); + if (prev_path != NULL) + gtk_tree_path_free (prev_path); } if (err != NULL) { @@ -540,7 +603,7 @@ modest_ui_actions_on_delete_message_or_folder (GtkAction *action, ModestWindow * if (MODEST_IS_MAIN_WINDOW (win)) { GtkWidget *w; w = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), - MODEST_WIDGET_TYPE_FOLDER_VIEW); + MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); if (gtk_widget_is_focus (w)) { modest_ui_actions_on_delete_folder (action, MODEST_MAIN_WINDOW(win)); return; @@ -553,7 +616,9 @@ modest_ui_actions_on_delete_message_or_folder (GtkAction *action, ModestWindow * void modest_ui_actions_on_quit (GtkAction *action, ModestWindow *win) -{ +{ + ModestWindowMgr *mgr = NULL; + #ifdef MODEST_PLATFORM_MAEMO modest_osso_save_state(); #endif /* MODEST_PLATFORM_MAEMO */ @@ -568,11 +633,16 @@ modest_ui_actions_on_quit (GtkAction *action, ModestWindow *win) g_debug ("queue has been cleared"); + + /* Check if there are opened editing windows */ + mgr = modest_runtime_get_window_mgr (); + modest_window_mgr_close_all_windows (mgr); + /* note: when modest-tny-account-store is finalized, it will automatically set all network connections to offline */ - gtk_main_quit (); +/* gtk_main_quit (); */ } void @@ -614,22 +684,22 @@ modest_ui_actions_on_add_to_contacts (GtkAction *action, ModestWindow *win) } void -modest_ui_actions_on_accounts (GtkAction *action, ModestWindow *win) +modest_ui_actions_on_accounts (GtkAction *action, + ModestWindow *win) { /* This is currently only implemented for Maemo */ #ifdef MODEST_PLATFORM_MAEMO /* Defined in config.h */ - if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE)) { - modest_run_account_setup_wizard (win); + if (!modest_account_mgr_has_accounts (modest_runtime_get_account_mgr(), TRUE)) { + modest_ui_actions_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)); + } else { + /* Show the list of accounts */ + GtkWindow *account_win = GTK_WINDOW (modest_account_view_window_new ()); + gtk_window_set_transient_for (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); + /* The accounts dialog must be modal */ + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), account_win); + modest_maemo_show_dialog_and_forget (GTK_WINDOW (win), GTK_DIALOG (account_win)); } #else GtkWidget *dialog, *label; @@ -661,12 +731,9 @@ modest_ui_actions_on_accounts (GtkAction *action, ModestWindow *win) static void on_smtp_servers_window_hide (GtkWindow* window, gpointer user_data) { - ModestWindow *main_window = MODEST_WINDOW (user_data); - /* Save any changes. */ modest_connection_specific_smtp_window_save_server_accounts ( - MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (window), - modest_window_get_active_account (main_window)); + MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (window)); gtk_widget_destroy (GTK_WIDGET (window)); } @@ -682,22 +749,10 @@ modest_ui_actions_on_smtp_servers (GtkAction *action, ModestWindow *win) #ifdef MODEST_PLATFORM_MAEMO /* Defined in config.h */ /* Create the window if necessary: */ - const gchar *active_account_name = modest_window_get_active_account (win); - - /* TODO: Dim the menu item (not in the UI spec)? or show a warning, - * or show the default account? - * If we show the default account then the account name should be shown in - * the window when we show it. */ - if (!active_account_name) { - g_warning ("%s: No account is active.", __FUNCTION__); - return; - } - GtkWidget *specific_window = GTK_WIDGET (modest_connection_specific_smtp_window_new ()); modest_connection_specific_smtp_window_fill_with_connections ( MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (specific_window), - modest_runtime_get_account_mgr(), - active_account_name); + modest_runtime_get_account_mgr()); /* Show the window: */ gtk_window_set_transient_for (GTK_WINDOW (specific_window), GTK_WINDOW (win)); @@ -725,9 +780,8 @@ 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)) { - const gboolean created = modest_run_account_setup_wizard (win); - if (!created) - return; + if (!modest_ui_actions_run_account_setup_wizard (win)) + return; } account_name = g_strdup (modest_window_get_active_account (win)); @@ -784,7 +838,7 @@ modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win) if (win) gtk_window_set_transient_for (GTK_WINDOW (msg_win), - GTK_WINDOW (win)); + GTK_WINDOW (win)); gtk_widget_show_all (GTK_WIDGET (msg_win)); cleanup: @@ -859,12 +913,15 @@ open_msg_cb (ModestMailOperation *mail_op, TnyHeader *header, TnyMsg *msg, gpoi (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)) { - const gboolean created = modest_run_account_setup_wizard(parent_win); - if (!created) + if (!modest_ui_actions_run_account_setup_wizard(parent_win)) goto cleanup; } win = modest_msg_edit_window_new (msg, account, TRUE); - + + + /* Show banner */ + modest_platform_information_banner (NULL, NULL, _("mail_ib_opening_draft_message")); + } else { gchar *uid = modest_tny_folder_get_header_unique_id (header); @@ -875,7 +932,7 @@ open_msg_cb (ModestMailOperation *mail_op, TnyHeader *header, TnyMsg *msg, gpoi GtkTreeModel *model; header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(parent_win), - MODEST_WIDGET_TYPE_HEADER_VIEW); + MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (header_view)); sel_list = gtk_tree_selection_get_selected_rows (sel, &model); @@ -921,6 +978,20 @@ cleanup: g_object_unref (folder); } + +static void +open_msg_error_handler (ModestMailOperation *mail_op, + gpointer user_data) +{ + /* Show the message error */ + GObject *win = modest_mail_operation_get_source (mail_op); + + modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL, + (gchar *) user_data); + if (win) + g_object_unref (win); +} + void modest_ui_actions_get_msgs_full_error_handler (ModestMailOperation *mail_op, gpointer user_data) @@ -929,7 +1000,6 @@ modest_ui_actions_get_msgs_full_error_handler (ModestMailOperation *mail_op, GObject *win = modest_mail_operation_get_source (mail_op); error = modest_mail_operation_get_error (mail_op); - printf ("DEBUG: %s: Error: code=%d, text=%s\n", __FUNCTION__, error->code, error->message); if (error->code == MODEST_MAIL_OPERATION_ERROR_MESSAGE_SIZE_LIMIT) { @@ -944,6 +1014,27 @@ modest_ui_actions_get_msgs_full_error_handler (ModestMailOperation *mail_op, g_object_unref (win); } +/** + * Returns the account a list of headers belongs to. It returns a + * *new* reference so don't forget to unref it + */ +static TnyAccount* +get_account_from_header_list (TnyList *headers) +{ + TnyAccount *account = NULL; + + if (tny_list_get_length (headers) > 0) { + TnyIterator *iter = tny_list_create_iterator (headers); + TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter)); + TnyFolder *folder = tny_header_get_folder (header); + account = tny_folder_get_account (folder); + g_object_unref (folder); + g_object_unref (header); + g_object_unref (iter); + } + return account; +} + /* * This function is used by both modest_ui_actions_on_open and * modest_ui_actions_on_header_activated. This way we always do the @@ -953,10 +1044,11 @@ static void _modest_ui_actions_open (TnyList *headers, ModestWindow *win) { ModestWindowMgr *mgr = NULL; - TnyIterator *iter = NULL; + TnyIterator *iter = NULL, *iter_not_opened = NULL; ModestMailOperation *mail_op = NULL; TnyList *not_opened_headers = NULL; TnyHeaderFlags flags = 0; + TnyAccount *account; g_return_if_fail (headers != NULL); @@ -967,14 +1059,16 @@ _modest_ui_actions_open (TnyList *headers, ModestWindow *win) return; } + mgr = modest_runtime_get_window_mgr (); + iter = tny_list_create_iterator (headers); + /* Get the account */ + account = get_account_from_header_list (headers); + /* Look if we already have a message view for each header. If true, then remove the header from the list of headers to open */ - mgr = modest_runtime_get_window_mgr (); - iter = tny_list_create_iterator (headers); not_opened_headers = tny_simple_list_new (); - while (!tny_iterator_is_done (iter)) { ModestWindow *window = NULL; @@ -1008,6 +1102,10 @@ _modest_ui_actions_open (TnyList *headers, ModestWindow *win) } g_object_unref (iter); iter = NULL; + + /* Open each message */ + if (tny_list_get_length (not_opened_headers) == 0) + goto cleanup; /* If some messages would have to be downloaded, ask the user to * make a connection. It's generally easier to do this here (in the mainloop) @@ -1029,51 +1127,81 @@ _modest_ui_actions_open (TnyList *headers, ModestWindow *win) } g_object_unref (iter); - if (found && !modest_platform_connect_and_wait (GTK_WINDOW (win), NULL)) { - g_object_unref (not_opened_headers); - return; - } + /* Ask the user if there are any uncached messages */ + if (found && !connect_to_get_msg (win, + header_list_count_uncached_msgs (not_opened_headers), + account)) + goto cleanup; } /* Register the headers before actually creating the windows: */ - TnyIterator *iter_not_opened = tny_list_create_iterator (not_opened_headers); + 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)); 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; - - /* Open each message */ - if (tny_list_get_length (not_opened_headers) > 0) { - mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, - G_OBJECT (win), + + /* Create the mail operation */ + if (tny_list_get_length (not_opened_headers) > 1) { + mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT (win), modest_ui_actions_get_msgs_full_error_handler, - NULL); + NULL, NULL); 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_op, - not_opened_headers, - open_msg_cb, - NULL, - NULL); + + modest_mail_operation_get_msgs_full (mail_op, + not_opened_headers, + open_msg_cb, + NULL, + NULL); + } else { + TnyIterator *iter = tny_list_create_iterator (not_opened_headers); + TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter)); + const gchar *proto_name; + gchar *error_msg; + ModestTransportStoreProtocol proto; + + /* Get the error message depending on the protocol */ + proto_name = tny_account_get_proto (account); + if (proto_name != NULL) { + proto = modest_protocol_info_get_transport_store_protocol (proto_name); } else { - TnyIterator *iter = tny_list_create_iterator (not_opened_headers); - TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter)); - modest_mail_operation_get_msg (mail_op, header, open_msg_cb, NULL); - g_object_unref (header); - g_object_unref (iter); + proto = MODEST_PROTOCOL_STORE_MAILDIR; } - g_object_unref (mail_op); + + if (proto == MODEST_PROTOCOL_STORE_POP) { + error_msg = g_strdup (_("emev_ni_ui_pop3_msg_recv_error")); + } else if (proto == MODEST_PROTOCOL_STORE_IMAP) { + error_msg = g_strdup_printf (_("emev_ni_ui_imap_message_not_available_in_server"), + tny_header_get_subject (header)); + } else { + error_msg = g_strdup (_("mail_ni_ui_folder_get_msg_folder_error")); + } + + /* Create and call the mail operation */ + mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT (win), + open_msg_error_handler, + error_msg, + g_free); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); + + modest_mail_operation_get_msg (mail_op, header, open_msg_cb, NULL); + + g_object_unref (header); + g_object_unref (iter); } + g_object_unref (mail_op); +cleanup: /* Clean */ - if (not_opened_headers != NULL) + if (account) + g_object_unref (account); + if (not_opened_headers) g_object_unref (not_opened_headers); } @@ -1116,6 +1244,7 @@ reply_forward_cb (ModestMailOperation *mail_op, TnyHeader *header, TnyMsg *msg, TnyAccount *account = NULL; ModestWindowMgr *mgr = NULL; gchar *signature = NULL; + gboolean use_signature; /* If there was any error. The mail operation could be NULL, this means that we already have the message downloaded and @@ -1128,13 +1257,9 @@ reply_forward_cb (ModestMailOperation *mail_op, TnyHeader *header, TnyMsg *msg, from = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(), rf_helper->account_name); - if (modest_account_mgr_get_bool (modest_runtime_get_account_mgr(), - rf_helper->account_name, - MODEST_ACCOUNT_USE_SIGNATURE, FALSE)) { - signature = modest_account_mgr_get_string (modest_runtime_get_account_mgr (), - rf_helper->account_name, - MODEST_ACCOUNT_SIGNATURE, FALSE); - } + signature = modest_account_mgr_get_signature (modest_runtime_get_account_mgr(), + rf_helper->account_name, + &use_signature); /* Create reply mail */ switch (rf_helper->action) { @@ -1205,9 +1330,7 @@ cleanup: * downloaded (CACHED) then returns TRUE else returns FALSE. */ static gint -header_list_count_uncached_msgs ( - TnyList *header_list, - GtkWindow *win) +header_list_count_uncached_msgs (TnyList *header_list) { TnyIterator *iter; gint uncached_messages = 0; @@ -1234,23 +1357,26 @@ header_list_count_uncached_msgs ( * messages. Returns TRUE if the user allowed the download. */ static gboolean -connect_to_get_msg (GtkWindow *win, - gint num_of_uncached_msgs) +connect_to_get_msg (ModestWindow *win, + gint num_of_uncached_msgs, + TnyAccount *account) { + GtkResponseType response; + /* Allways download if we are online. */ if (tny_device_is_online (modest_runtime_get_device ())) return TRUE; /* If offline, then ask for user permission to download the messages */ - GtkResponseType response; response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win), ngettext("mcen_nc_get_msg", "mcen_nc_get_msgs", num_of_uncached_msgs)); + if (response == GTK_RESPONSE_CANCEL) return FALSE; - return modest_platform_connect_and_wait(win, NULL); + return modest_platform_connect_and_wait(GTK_WINDOW (win), account); } /* @@ -1270,8 +1396,7 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) /* we need an account when editing */ if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE)) { - const gboolean created = modest_run_account_setup_wizard (win); - if (!created) + if (!modest_ui_actions_run_account_setup_wizard (win)) return; } @@ -1290,16 +1415,16 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) if (do_retrieve){ gint num_of_unc_msgs; + /* check that the messages have been previously downloaded */ - num_of_unc_msgs = header_list_count_uncached_msgs( - header_list, - GTK_WINDOW (win)); + num_of_unc_msgs = header_list_count_uncached_msgs(header_list); /* If there are any uncached message ask the user * whether he/she wants to download them. */ - if (num_of_unc_msgs) - continue_download = connect_to_get_msg ( - GTK_WINDOW (win), - num_of_unc_msgs); + if (num_of_unc_msgs) { + TnyAccount *account = get_account_from_header_list (header_list); + continue_download = connect_to_get_msg (win, num_of_unc_msgs, account); + g_object_unref (account); + } } if (!continue_download) { @@ -1353,11 +1478,10 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) 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); + mail_op = + modest_mail_operation_new_with_error_handling (G_OBJECT(win), + modest_ui_actions_get_msgs_full_error_handler, + NULL, NULL); modest_mail_operation_queue_add ( modest_runtime_get_mail_operation_queue (), mail_op); @@ -1416,7 +1540,7 @@ modest_ui_actions_on_next (GtkAction *action, header_view = modest_main_window_get_child_widget ( MODEST_MAIN_WINDOW(window), - MODEST_WIDGET_TYPE_HEADER_VIEW); + MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); if (!header_view) return; @@ -1439,7 +1563,7 @@ modest_ui_actions_on_prev (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); + MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); if (!header_view) return; @@ -1460,7 +1584,7 @@ modest_ui_actions_on_sort (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); + MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); if (!header_view) { modest_platform_information_banner (NULL, NULL, _CS("ckdg_ib_nothing_to_sort")); @@ -1474,7 +1598,7 @@ modest_ui_actions_on_sort (GtkAction *action, static void new_messages_arrived (ModestMailOperation *self, - gint new_messages, + TnyList *new_headers, gpointer user_data) { ModestMainWindow *win = NULL; @@ -1485,10 +1609,15 @@ new_messages_arrived (ModestMailOperation *self, g_return_if_fail (MODEST_IS_MAIN_WINDOW (user_data)); win = MODEST_MAIN_WINDOW (user_data); + /* Don't do anything if there are not new headers, this could + happen if there was any problem with the mail operation */ + if (!new_headers) + return; + /* 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); + MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view)); @@ -1500,8 +1629,8 @@ new_messages_arrived (ModestMailOperation *self, } /* Notify new messages have been downloaded */ - if (new_messages > 0) - modest_platform_on_new_msg (); + if ((new_headers != NULL) && (tny_list_get_length (new_headers) > 0)) + modest_platform_on_new_headers_received (new_headers); } /* @@ -1515,6 +1644,7 @@ modest_ui_actions_do_send_receive (const gchar *account_name, ModestWindow *win) { gchar *acc_name = NULL; ModestMailOperation *mail_op; + TnyAccount *store_account = NULL; /* If no account name was provided then get the current account, and if there is no current account then pick the default one: */ @@ -1530,16 +1660,27 @@ modest_ui_actions_do_send_receive (const gchar *account_name, ModestWindow *win) acc_name = g_strdup (account_name); } + + /* Ensure that we have a connection available */ + store_account = + modest_tny_account_store_get_server_account (modest_runtime_get_account_store (), + acc_name, + TNY_ACCOUNT_TYPE_STORE); + if (!modest_platform_connect_and_wait (NULL, TNY_ACCOUNT (store_account))) { + g_object_unref (store_account); + return; + } + g_object_unref (store_account); + /* Set send/receive operation in progress */ modest_main_window_notify_send_receive_initied (MODEST_MAIN_WINDOW(win)); - mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, - G_OBJECT (win), + mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT (win), modest_ui_actions_send_receive_error_handler, - NULL); + NULL, NULL); - g_signal_connect (G_OBJECT(mail_op), "progress-changed", - G_CALLBACK (_on_send_receive_progress_changed), + g_signal_connect (G_OBJECT(mail_op), "operation-finished", + G_CALLBACK (on_send_receive_finished), win); /* Send & receive. */ @@ -1663,7 +1804,7 @@ modest_do_refresh_current_folder(ModestWindow *win) /* Get folder and header view */ folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), - MODEST_WIDGET_TYPE_FOLDER_VIEW); + MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); if (!folder_view) return; @@ -1672,7 +1813,7 @@ modest_do_refresh_current_folder(ModestWindow *win) if (folder_store && TNY_IS_FOLDER (folder_store)) { header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), - MODEST_WIDGET_TYPE_HEADER_VIEW); + MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); /* We do not need to set the contents style because it hasn't changed. We also do not @@ -1720,7 +1861,7 @@ modest_ui_actions_toggle_header_list_view (GtkAction *action, ModestMainWindow * g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window)); header_view = modest_main_window_get_child_widget (main_window, - MODEST_WIDGET_TYPE_HEADER_VIEW); + MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); if (!header_view) return; @@ -1759,7 +1900,7 @@ modest_ui_actions_on_header_selected (ModestHeaderView *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); + MODEST_MAIN_WINDOW_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)); @@ -1790,6 +1931,11 @@ modest_ui_actions_on_header_activated (ModestHeaderView *header_view, if (!header) return; + if (modest_header_view_count_selected_headers (header_view) > 1) { + hildon_banner_show_information (NULL, NULL, _("mcen_ib_select_one_message")); + return; + } + /* headers = tny_simple_list_new (); */ /* tny_list_prepend (headers, G_OBJECT (header)); */ @@ -1838,7 +1984,6 @@ folder_refreshed_cb (ModestMailOperation *mail_op, { ModestMainWindow *win = NULL; GtkWidget *header_view; - TnyFolder *current_folder; gboolean folder_empty = FALSE; gboolean all_marked_as_deleted = FALSE; @@ -1846,13 +1991,17 @@ folder_refreshed_cb (ModestMailOperation *mail_op, win = MODEST_MAIN_WINDOW (user_data); header_view = - modest_main_window_get_child_widget(win, MODEST_WIDGET_TYPE_HEADER_VIEW); + modest_main_window_get_child_widget(win, MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); if (header_view) { + TnyFolder *current_folder; + current_folder = modest_header_view_get_folder (MODEST_HEADER_VIEW (header_view)); if (current_folder != NULL && folder != current_folder) { + g_object_unref (current_folder); return; } + g_object_unref (current_folder); } /* Check if folder is empty and set headers view contents style */ @@ -1875,7 +2024,7 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view, g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window)); header_view = modest_main_window_get_child_widget(main_window, - MODEST_WIDGET_TYPE_HEADER_VIEW); + MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); if (!header_view) return; @@ -2022,6 +2171,22 @@ modest_ui_actions_on_msg_recpt_activated (ModestMsgView *msgview, /* g_message ("%s %s", __FUNCTION__, address); */ } +static void +on_save_to_drafts_cb (ModestMailOperation *mail_op, + TnyMsg *saved_draft, + gpointer user_data) +{ + ModestMsgEditWindow *edit_window; + + edit_window = MODEST_MSG_EDIT_WINDOW (user_data); + + /* If there was any error do nothing */ + if (modest_mail_operation_get_error (mail_op) != NULL) + return; + + modest_msg_edit_window_set_draft (edit_window, saved_draft); +} + void modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edit_window) { @@ -2064,13 +2229,12 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi from = modest_account_mgr_get_from_string (account_mgr, account_name); /* Create the mail operation */ - mail_operation = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_INFO, G_OBJECT(edit_window)); + mail_operation = modest_mail_operation_new (G_OBJECT(edit_window)); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_operation); modest_mail_operation_save_to_drafts (mail_operation, transport_account, data->draft_msg, - edit_window, from, data->to, data->cc, @@ -2079,7 +2243,10 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi data->plain_body, data->html_body, data->attachments, - data->priority_flags); + data->images, + data->priority_flags, + on_save_to_drafts_cb, + edit_window); /* Frees */ g_free (from); g_free (account_name); @@ -2090,6 +2257,7 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi info_text = g_strdup_printf (_("mail_va_saved_to_drafts"), _("mcen_me_folder_drafts")); modest_platform_information_banner (NULL, NULL, info_text); + modest_msg_edit_window_reset_modified (edit_window); g_free (info_text); } @@ -2102,10 +2270,6 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *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), NULL)) - return; - /* FIXME: Code added just for testing. The final version will use the send queue provided by tinymail and some classifier */ @@ -2116,8 +2280,7 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) if (!account_name) { /* Run account setup wizard */ - const gboolean created = modest_run_account_setup_wizard(MODEST_WINDOW(edit_window)); - if (!created) + if (!modest_ui_actions_run_account_setup_wizard (MODEST_WINDOW(edit_window))) return; } @@ -2134,15 +2297,14 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) account_name)); if (!transport_account) { /* Run account setup wizard */ - const gboolean created = modest_run_account_setup_wizard(MODEST_WINDOW(edit_window)); - if (!created) + if (!modest_ui_actions_run_account_setup_wizard(MODEST_WINDOW(edit_window))) return; } gchar *from = modest_account_mgr_get_from_string (account_mgr, account_name); /* Create the mail operation */ - ModestMailOperation *mail_operation = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_SEND, G_OBJECT(edit_window)); + ModestMailOperation *mail_operation = modest_mail_operation_new (G_OBJECT(edit_window)); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_operation); modest_mail_operation_send_new_mail (mail_operation, @@ -2156,6 +2318,7 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) data->plain_body, data->html_body, data->attachments, + data->images, data->priority_flags); /* Free data: */ @@ -2323,10 +2486,9 @@ modest_ui_actions_new_folder_error_handler (ModestMailOperation *mail_op, ModestMainWindow *window = MODEST_MAIN_WINDOW (user_data); const GError *error = modest_mail_operation_get_error (mail_op); - if(error) - { + if(error) { modest_platform_information_banner (GTK_WIDGET (window), NULL, - modest_mail_operation_get_error (mail_op)->message); + _("mail_in_ui_folder_create_error")); } } @@ -2374,10 +2536,9 @@ modest_ui_actions_create_folder(GtkWidget *parent_window, ModestMailOperation *mail_op; TnyFolder *new_folder = NULL; - mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_INFO, - G_OBJECT(parent_window), + mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(parent_window), modest_ui_actions_new_folder_error_handler, - parent_window); + parent_window, NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); @@ -2410,7 +2571,7 @@ modest_ui_actions_on_new_folder (GtkAction *action, ModestMainWindow *main_windo 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); + MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); if (!folder_view) return; @@ -2452,12 +2613,12 @@ modest_ui_actions_on_rename_folder (GtkAction *action, 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); + MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); if (!folder_view) return; header_view = modest_main_window_get_child_widget (main_window, - MODEST_WIDGET_TYPE_HEADER_VIEW); + MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); if (!header_view) return; @@ -2495,10 +2656,9 @@ modest_ui_actions_on_rename_folder (GtkAction *action, GtkTreeSelection *sel = NULL; mail_op = - modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_INFO, - G_OBJECT(main_window), + modest_mail_operation_new_with_error_handling (G_OBJECT(main_window), modest_ui_actions_rename_folder_error_handler, - main_window); + main_window, NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); @@ -2534,7 +2694,7 @@ modest_ui_actions_delete_folder_error_handler (ModestMailOperation *mail_op, g_object_unref (win); } -static void +static gboolean delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) { TnyFolderStore *folder; @@ -2543,12 +2703,12 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) gchar *message; gboolean do_delete = TRUE; - g_return_if_fail (MODEST_IS_MAIN_WINDOW (main_window)); + g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (main_window), FALSE); folder_view = modest_main_window_get_child_widget (main_window, - MODEST_WIDGET_TYPE_FOLDER_VIEW); + MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); if (!folder_view) - return; + return FALSE; folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); @@ -2557,7 +2717,7 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) modest_platform_run_information_dialog (GTK_WINDOW (main_window), _("mail_in_ui_folder_delete_error")); g_object_unref (G_OBJECT (folder)); - return ; + return FALSE; } /* Ask the user */ @@ -2586,10 +2746,9 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) /* Create the mail operation */ mail_op = - modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_DELETE, - G_OBJECT(main_window), + modest_mail_operation_new_with_error_handling (G_OBJECT(main_window), modest_ui_actions_delete_folder_error_handler, - NULL); + NULL, NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); @@ -2598,21 +2757,23 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) } g_object_unref (G_OBJECT (folder)); + + return do_delete; } 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)); + if (delete_folder (main_window, FALSE)) { + GtkWidget *folder_view; + + folder_view = modest_main_window_get_child_widget (main_window, + MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); + modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (folder_view)); + } } void @@ -2688,7 +2849,7 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store, gtk_window_set_transient_for (GTK_WINDOW(dialog), GTK_WINDOW(main_window)); - gchar *server_name = modest_server_account_get_hostname ( + gchar *server_name = modest_account_mgr_get_server_account_hostname ( modest_runtime_get_account_mgr(), server_account_name); if (!server_name) {/* This happened once, though I don't know why. murrayc. */ g_warning("%s: Could not get server name for server account '%s'", __FUNCTION__, server_account_name); @@ -2706,7 +2867,7 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store, server_name = NULL; /* username: */ - gchar *initial_username = modest_server_account_get_username ( + gchar *initial_username = modest_account_mgr_get_server_account_username ( modest_runtime_get_account_mgr(), server_account_name); GtkWidget *entry_username = gtk_entry_new (); @@ -2715,7 +2876,7 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store, /* Dim this if a connection has ever succeeded with this username, * as per the UI spec: */ const gboolean username_known = - modest_server_account_get_username_has_succeeded( + modest_account_mgr_get_server_account_username_has_succeeded( modest_runtime_get_account_mgr(), server_account_name); gtk_widget_set_sensitive (entry_username, !username_known); @@ -2760,6 +2921,9 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store, gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), entry_password, TRUE, FALSE, 0); #endif /* MODEST_PLATFORM_MAEMO */ + + if (initial_username != NULL) + gtk_widget_grab_focus (GTK_WIDGET (entry_password)); /* This is not in the Maemo UI spec: remember_pass_check = gtk_check_button_new_with_label (_("Remember password")); @@ -2773,7 +2937,7 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store, if (username) { *username = g_strdup (gtk_entry_get_text (GTK_ENTRY(entry_username))); - modest_server_account_set_username ( + modest_account_mgr_set_server_account_username ( modest_runtime_get_account_mgr(), server_account_name, *username); @@ -2851,13 +3015,13 @@ modest_ui_actions_on_cut (GtkAction *action, gboolean continue_download = FALSE; gint num_of_unc_msgs; - num_of_unc_msgs = header_list_count_uncached_msgs( - header_list, GTK_WINDOW (window)); + num_of_unc_msgs = header_list_count_uncached_msgs(header_list); - if (num_of_unc_msgs) - continue_download = connect_to_get_msg( - GTK_WINDOW (window), - num_of_unc_msgs); + if (num_of_unc_msgs) { + TnyAccount *account = get_account_from_header_list (header_list); + continue_download = connect_to_get_msg (window, num_of_unc_msgs, account); + g_object_unref (account); + } if (num_of_unc_msgs == 0 || continue_download) { /* modest_platform_information_banner ( @@ -2907,14 +3071,13 @@ modest_ui_actions_on_copy (GtkAction *action, gboolean continue_download = FALSE; gint num_of_unc_msgs; - num_of_unc_msgs = header_list_count_uncached_msgs( - header_list, - GTK_WINDOW (window)); + num_of_unc_msgs = header_list_count_uncached_msgs(header_list); - if (num_of_unc_msgs) - continue_download = connect_to_get_msg( - GTK_WINDOW (window), - num_of_unc_msgs); + if (num_of_unc_msgs) { + TnyAccount *account = get_account_from_header_list (header_list); + continue_download = connect_to_get_msg (window, num_of_unc_msgs, account); + g_object_unref (account); + } if (num_of_unc_msgs == 0 || continue_download) { modest_platform_information_banner ( @@ -2968,11 +3131,8 @@ modest_ui_actions_on_redo (GtkAction *action, static void -paste_msgs_cb (const GObject *object, gpointer user_data) +destroy_information_note (ModestMailOperation *mail_op, gpointer user_data) { - g_return_if_fail (MODEST_IS_MAIN_WINDOW (object)); - g_return_if_fail (GTK_IS_WIDGET (user_data)); - /* destroy information note */ gtk_widget_destroy (GTK_WIDGET(user_data)); } @@ -3035,8 +3195,7 @@ modest_ui_actions_on_paste (GtkAction *action, 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)); + mail_op = modest_mail_operation_new (G_OBJECT (window)); if (helper->banner != NULL) { g_object_ref (G_OBJECT (helper->banner)); gtk_window_set_modal (GTK_WINDOW (helper->banner), FALSE); @@ -3067,7 +3226,7 @@ modest_ui_actions_on_paste (GtkAction *action, modest_email_clipboard_get_data (clipboard, &src_folder, &data, &delete); /* Create a new mail operation */ - mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(window)); + mail_op = modest_mail_operation_new (G_OBJECT(window)); /* Get destination folder */ folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (focused_widget)); @@ -3077,10 +3236,11 @@ modest_ui_actions_on_paste (GtkAction *action, gint response = 0; /* Ask for user confirmation */ - response = msgs_move_to_confirmation (GTK_WINDOW (window), - TNY_FOLDER (folder_store), - delete, - data); + response = + modest_ui_actions_msgs_move_to_confirmation (window, + TNY_FOLDER (folder_store), + delete, + data); if (response == GTK_RESPONSE_OK) { /* Launch notification */ @@ -3096,7 +3256,7 @@ modest_ui_actions_on_paste (GtkAction *action, data, TNY_FOLDER (folder_store), delete, - paste_msgs_cb, + destroy_information_note, inf_note); } else { g_object_unref (mail_op); @@ -3116,7 +3276,7 @@ modest_ui_actions_on_paste (GtkAction *action, src_folder, folder_store, delete, - paste_msgs_cb, + destroy_information_note, inf_note); } @@ -3160,7 +3320,7 @@ modest_ui_actions_on_select_all (GtkAction *action, if (!(MODEST_IS_HEADER_VIEW (focused_widget))) { header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (window), - MODEST_WIDGET_TYPE_HEADER_VIEW); + MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); } /* Disable window dimming management */ @@ -3214,9 +3374,10 @@ modest_ui_actions_on_change_zoom (GtkRadioAction *action, } } -void modest_ui_actions_msg_edit_on_change_priority (GtkRadioAction *action, - GtkRadioAction *selected, - ModestWindow *window) +void +modest_ui_actions_msg_edit_on_change_priority (GtkRadioAction *action, + GtkRadioAction *selected, + ModestWindow *window) { TnyHeaderFlags flags; g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window)); @@ -3225,9 +3386,10 @@ void modest_ui_actions_msg_edit_on_change_priority (GtkRadioAction *action, modest_msg_edit_window_set_priority_flags (MODEST_MSG_EDIT_WINDOW (window), flags); } -void modest_ui_actions_msg_edit_on_change_file_format (GtkRadioAction *action, - GtkRadioAction *selected, - ModestWindow *window) +void +modest_ui_actions_msg_edit_on_change_file_format (GtkRadioAction *action, + GtkRadioAction *selected, + ModestWindow *window) { gint file_format; @@ -3372,7 +3534,7 @@ modest_ui_actions_on_details (GtkAction *action, /* Check which widget has the focus */ folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), - MODEST_WIDGET_TYPE_FOLDER_VIEW); + MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); if (gtk_widget_is_focus (folder_view)) { TnyFolderStore *folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); @@ -3391,7 +3553,7 @@ modest_ui_actions_on_details (GtkAction *action, } else { header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), - MODEST_WIDGET_TYPE_HEADER_VIEW); + MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); /* Show details of each header */ do_headers_action (win, headers_action_show_details, header_view); } @@ -3446,7 +3608,7 @@ modest_ui_actions_on_toggle_toolbar (GtkToggleAction *toggle, /* Toggle toolbar */ mgr = modest_runtime_get_window_mgr (); - modest_window_mgr_show_toolbars (mgr, active, fullscreen); + modest_window_mgr_show_toolbars (mgr, G_TYPE_FROM_INSTANCE (window), active, fullscreen); } void @@ -3561,7 +3723,7 @@ on_move_to_dialog_folder_selection_changed (ModestFolderView* self, if (MODEST_IS_MAIN_WINDOW (user_data)) { /* Get the widgets */ folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (user_data), - MODEST_WIDGET_TYPE_FOLDER_VIEW); + MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); if (gtk_widget_is_focus (folder_view)) moving_folder = TRUE; } @@ -3758,26 +3920,25 @@ has_retrieved_msgs (TnyList *list) * GTK_RESPONSE_OK * * This one is used by the next functions: - * modest_ui_actions_xfer_messages_from_move_to * modest_ui_actions_on_paste - commented out * drag_and_drop_from_header_view (for d&d in modest_folder_view.c) */ gint -msgs_move_to_confirmation (GtkWindow *win, - TnyFolder *dest_folder, - gboolean delete, - TnyList *headers) +modest_ui_actions_msgs_move_to_confirmation (ModestWindow *win, + TnyFolder *dest_folder, + gboolean delete, + TnyList *headers) { gint response = GTK_RESPONSE_OK; + TnyAccount *account = NULL; + TnyFolder *src_folder = NULL; + TnyIterator *iter = NULL; + TnyHeader *header = NULL; /* return with OK if the destination is a remote folder */ if (modest_tny_folder_is_remote_folder (dest_folder)) return GTK_RESPONSE_OK; - 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)); @@ -3796,43 +3957,70 @@ msgs_move_to_confirmation (GtkWindow *win, g_object_unref (src_folder); return GTK_RESPONSE_OK; } - g_object_unref (src_folder); + + /* Get the account */ + account = tny_folder_get_account (src_folder); /* now if offline we ask the user */ - if(connect_to_get_msg( GTK_WINDOW (win), - tny_list_get_length (headers))) + if(connect_to_get_msg (win, tny_list_get_length (headers), account)) response = GTK_RESPONSE_OK; else response = GTK_RESPONSE_CANCEL; + /* Frees */ + g_object_unref (src_folder); + g_object_unref (account); + return response; } static void -move_to_cb (const GObject *object, gpointer user_data) +move_to_cb (ModestMailOperation *mail_op, gpointer user_data) { - ModestMsgViewWindow *self = NULL; - g_return_if_fail (GTK_IS_WIDGET (user_data)); - g_return_if_fail (MODEST_IS_WINDOW (object)); + MoveToHelper *helper = (MoveToHelper *) user_data; + + /* Note that the operation could have failed, in that case do + nothing */ + if (modest_mail_operation_get_status (mail_op) == + MODEST_MAIL_OPERATION_STATUS_SUCCESS) { - if (MODEST_IS_MSG_VIEW_WINDOW (object)) { - self = MODEST_MSG_VIEW_WINDOW (object); + GObject *object = modest_mail_operation_get_source (mail_op); + if (MODEST_IS_MSG_VIEW_WINDOW (object)) { + ModestMsgViewWindow *self = MODEST_MSG_VIEW_WINDOW (object); - if (!modest_msg_view_window_select_next_message (self)) - if (!modest_msg_view_window_select_previous_message (self)) - /* No more messages to view, so close this window */ - modest_ui_actions_on_close_window (NULL, MODEST_WINDOW(self)); + if (!modest_msg_view_window_select_next_message (self)) + 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)); + } else if (MODEST_IS_MAIN_WINDOW (object) && helper->reference != NULL) { + GtkWidget *header_view; + GtkTreePath *path; + GtkTreeSelection *sel; + + header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(object), + MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (header_view)); + path = gtk_tree_row_reference_get_path (helper->reference); + gtk_tree_selection_select_path (sel, path); + gtk_tree_path_free (path); + } + g_object_unref (object); } - gtk_widget_destroy (GTK_WIDGET(user_data)); + + /* Close the "Pasting" information banner */ + gtk_widget_destroy (GTK_WIDGET(helper->banner)); + if (helper->reference != NULL) + gtk_tree_row_reference_free (helper->reference); + g_free (helper); } void modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op, gpointer user_data) { - ModestMainWindow *main_window = NULL; + ModestWindow *main_window = NULL; GtkWidget *folder_view = NULL; GObject *win = modest_mail_operation_get_source (mail_op); const GError *error = NULL; @@ -3847,11 +4035,14 @@ modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op, } /* Disable next automatic folder selection */ - if (MODEST_IS_MAIN_WINDOW (user_data)) { - main_window = MODEST_MAIN_WINDOW(user_data); - folder_view = modest_main_window_get_child_widget (main_window, - MODEST_WIDGET_TYPE_FOLDER_VIEW); - modest_folder_view_disable_next_folder_selection (MODEST_FOLDER_VIEW(folder_view)); + main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()); + folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (main_window), + MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); + modest_folder_view_disable_next_folder_selection (MODEST_FOLDER_VIEW(folder_view)); + + if (user_data && TNY_IS_FOLDER (user_data)) { + modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view), + TNY_FOLDER (user_data), FALSE); } /* Show notification dialog */ @@ -3923,6 +4114,8 @@ open_msg_for_purge_cb (ModestMailOperation *mail_op, tny_iterator_next (iter); } + g_object_unref (iter); + if (pending_purges>0) { gint response; @@ -3930,7 +4123,7 @@ open_msg_for_purge_cb (ModestMailOperation *mail_op, if (response == GTK_RESPONSE_OK) { modest_platform_information_banner (NULL, NULL, _("mcen_ib_removing_attachment")); - tny_iterator_first (iter); + iter = tny_list_create_iterator (parts); while (!tny_iterator_is_done (iter)) { TnyMimePart *part; @@ -3949,26 +4142,10 @@ open_msg_for_purge_cb (ModestMailOperation *mail_op, } else { modest_platform_information_banner (NULL, NULL, _("mail_ib_attachment_already_purged")); } + g_object_unref (iter); - /* remove attachments */ - tny_iterator_first (iter); - while (!tny_iterator_is_done (iter)) { - TnyMimePart *part; - - part = TNY_MIME_PART (tny_iterator_get_current (iter)); - 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); } @@ -3987,7 +4164,7 @@ modest_ui_actions_on_main_window_remove_attachments (GtkAction *action, g_return_if_fail (MODEST_IS_MAIN_WINDOW (win)); header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), - MODEST_WIDGET_TYPE_HEADER_VIEW); + MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); header_list = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (header_view)); @@ -4014,10 +4191,9 @@ modest_ui_actions_on_main_window_remove_attachments (GtkAction *action, } else { ModestMailOperation *mail_op = NULL; modest_window_mgr_register_header (modest_runtime_get_window_mgr (), header); - mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, - G_OBJECT (win), + mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT (win), modest_ui_actions_get_msgs_full_error_handler, - NULL); + NULL, NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); modest_mail_operation_get_msg (mail_op, header, open_msg_for_purge_cb, win); @@ -4038,7 +4214,6 @@ modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder, ModestWindow *win) { TnyList *headers = NULL; - gint response = 0; TnyAccount *dst_account = NULL; const gchar *proto_str = NULL; gboolean dst_is_pop = FALSE; @@ -4073,39 +4248,36 @@ modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder, return; } - /* Ask for user confirmation */ - response = msgs_move_to_confirmation (GTK_WINDOW (win), - TNY_FOLDER (dst_folder), - TRUE, - headers); - - /* Transfer messages */ - if (response == GTK_RESPONSE_OK) { - GtkWidget *inf_note; - inf_note = modest_platform_animation_banner (GTK_WIDGET (win), 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)); - } + MoveToHelper *helper = g_new0 (MoveToHelper, 1); + helper->banner = modest_platform_animation_banner (GTK_WIDGET (win), NULL, + _CS("ckct_nw_pasting")); + if (helper->banner != NULL) { + gtk_window_set_modal (GTK_WINDOW(helper->banner), FALSE); + gtk_widget_show (GTK_WIDGET(helper->banner)); + } - 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); + if (MODEST_IS_MAIN_WINDOW (win)) { + GtkWidget *header_view = + modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win), + MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); + helper->reference = get_next_after_selected_headers (MODEST_HEADER_VIEW (header_view)); + } - modest_mail_operation_xfer_msgs (mail_op, - headers, - TNY_FOLDER (dst_folder), - TRUE, - move_to_cb, - inf_note); + ModestMailOperation *mail_op = + modest_mail_operation_new_with_error_handling (G_OBJECT(win), + modest_ui_actions_move_folder_error_handler, + NULL, NULL); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), + mail_op); - g_object_unref (G_OBJECT (mail_op)); - } + modest_mail_operation_xfer_msgs (mail_op, + headers, + TNY_FOLDER (dst_folder), + TRUE, + move_to_cb, + helper); + + g_object_unref (G_OBJECT (mail_op)); g_object_unref (headers); } @@ -4130,7 +4302,7 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action, src_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); /* Get header view */ - header_view = MODEST_HEADER_VIEW(modest_main_window_get_child_widget (win, MODEST_WIDGET_TYPE_HEADER_VIEW)); + header_view = MODEST_HEADER_VIEW(modest_main_window_get_child_widget (win, MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW)); /* Get folder or messages to transfer */ if (gtk_widget_is_focus (folder_view)) { @@ -4145,29 +4317,29 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action, g_warning ("%s: src_folder is not a TnyFolder.\n", __FUNCTION__); do_xfer = FALSE; } else if (!online && modest_platform_is_network_folderstore(src_folder)) { - guint num_headers = tny_folder_get_all_count(TNY_FOLDER(src_folder)); - if (!connect_to_get_msg(GTK_WINDOW(win), num_headers)) { + guint num_headers = tny_folder_get_all_count(TNY_FOLDER (src_folder)); + TnyAccount *account = tny_folder_get_account (TNY_FOLDER (src_folder)); + if (!connect_to_get_msg(MODEST_WINDOW (win), num_headers, account)) do_xfer = FALSE; - } + g_object_unref (account); } if (do_xfer) { - GtkWidget *inf_note; - inf_note = modest_platform_animation_banner (GTK_WIDGET (win), 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)); + MoveToHelper *helper = g_new0 (MoveToHelper, 1); + helper->banner = modest_platform_animation_banner (GTK_WIDGET (win), NULL, + _CS("ckct_nw_pasting")); + if (helper->banner != NULL) { + gtk_window_set_modal (GTK_WINDOW(helper->banner), FALSE); + gtk_widget_show (GTK_WIDGET(helper->banner)); } /* Clean folder on header view before moving it */ sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_view)); gtk_tree_selection_unselect_all (sel); mail_op = - modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, - G_OBJECT(win), + modest_mail_operation_new_with_error_handling (G_OBJECT(win), modest_ui_actions_move_folder_error_handler, - win); + src_folder, NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); @@ -4179,7 +4351,9 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action, modest_mail_operation_xfer_folder (mail_op, TNY_FOLDER (src_folder), dst_folder, - TRUE, move_to_cb, inf_note); + TRUE, + move_to_cb, + helper); /* Unref mail operation */ g_object_unref (G_OBJECT (mail_op)); } @@ -4187,10 +4361,15 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action, gboolean do_xfer = TRUE; /* Ask for confirmation if the source folder is remote and we're not connected */ if (!online && modest_platform_is_network_folderstore(src_folder)) { - guint num_headers = modest_header_view_count_selected_headers(header_view); - if (!connect_to_get_msg(GTK_WINDOW(win), num_headers)) { - do_xfer = FALSE; + TnyList *headers = modest_header_view_get_selected_headers(header_view); + if (!msgs_already_deleted_from_server(headers, src_folder)) { + guint num_headers = tny_list_get_length(headers); + TnyAccount *account = get_account_from_header_list (headers); + if (!connect_to_get_msg(MODEST_WINDOW (win), num_headers, account)) + do_xfer = FALSE; + g_object_unref (account); } + g_object_unref(headers); } if (do_xfer) /* Transfer messages */ modest_ui_actions_xfer_messages_from_move_to (dst_folder, MODEST_WINDOW (win)); @@ -4211,19 +4390,22 @@ modest_ui_actions_on_msg_view_window_move_to (GtkAction *action, ModestMsgViewWindow *win) { TnyHeader *header = NULL; - TnyFolderStore *src_folder; + TnyFolder *src_folder = NULL; + TnyAccount *account = NULL; /* Create header list */ header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win)); - src_folder = TNY_FOLDER_STORE(tny_header_get_folder(header)); + src_folder = TNY_FOLDER (tny_header_get_folder(header)); g_object_unref (header); /* Transfer the message if online or confirmed by the user */ - if (tny_device_is_online (modest_runtime_get_device()) || - (modest_platform_is_network_folderstore(src_folder) && connect_to_get_msg(GTK_WINDOW(win), 1))) { + account = tny_folder_get_account (src_folder); + if (remote_folder_is_pop(TNY_FOLDER_STORE (src_folder)) || + (modest_platform_is_network_folderstore(TNY_FOLDER_STORE (src_folder)) && + connect_to_get_msg(MODEST_WINDOW (win), 1, account))) { modest_ui_actions_xfer_messages_from_move_to (dst_folder, MODEST_WINDOW (win)); } - + g_object_unref (account); g_object_unref (src_folder); } @@ -4249,7 +4431,7 @@ modest_ui_actions_on_move_to (GtkAction *action, /* 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); + MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); else folder_view = NULL; @@ -4392,7 +4574,7 @@ modest_ui_actions_on_help (GtkAction *action, /* Get selected folder */ folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), - MODEST_WIDGET_TYPE_FOLDER_VIEW); + MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); /* Switch help_id */ @@ -4444,10 +4626,9 @@ modest_ui_actions_on_retrieve_msg_contents (GtkAction *action, return; /* Create mail operation */ - mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, - G_OBJECT (window), + mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT (window), modest_ui_actions_get_msgs_full_error_handler, - NULL); + NULL, NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); modest_mail_operation_get_msgs_full (mail_op, headers, NULL, NULL, NULL); @@ -4487,6 +4668,16 @@ modest_ui_actions_on_view_menu_activated (GtkAction *action, } void +modest_ui_actions_on_format_menu_activated (GtkAction *action, + ModestWindow *window) +{ + g_return_if_fail (MODEST_IS_WINDOW (window)); + + /* Update dimmed */ + modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules"); +} + +void modest_ui_actions_on_tools_menu_activated (GtkAction *action, ModestWindow *window) { @@ -4571,16 +4762,111 @@ modest_ui_actions_on_toggle_find_in_page (GtkToggleAction *action, } static void -_on_send_receive_progress_changed (ModestMailOperation *mail_op, - ModestMailOperationState *state, - gpointer user_data) +on_send_receive_finished (ModestMailOperation *mail_op, + gpointer user_data) { - g_return_if_fail (MODEST_IS_MAIN_WINDOW(user_data)); - /* Set send/receive operation finished */ - if (state->status != MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS) - modest_main_window_notify_send_receive_completed (MODEST_MAIN_WINDOW(user_data)); + modest_main_window_notify_send_receive_completed (MODEST_MAIN_WINDOW (user_data)); +} + + +void +modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self, + TnyHeader *header, + TnyMsg *msg, + GError *err, + gpointer user_data) +{ + const gchar* server_name = NULL; + TnyTransportAccount *server_account; + gchar *message = NULL; + + /* Don't show anything if the user cancelled something */ + if (err->code == TNY_TRANSPORT_ACCOUNT_ERROR_SEND_USER_CANCEL) + return; + + /* Get the server name: */ + server_account = + TNY_TRANSPORT_ACCOUNT (tny_camel_send_queue_get_transport_account (TNY_CAMEL_SEND_QUEUE (self))); + if (server_account) { + server_name = tny_account_get_hostname (TNY_ACCOUNT (server_account)); + + g_object_unref (server_account); + server_account = NULL; + } + g_return_if_fail (server_name); + + /* Show the appropriate message text for the GError: */ + switch (err->code) { + case TNY_TRANSPORT_ACCOUNT_ERROR_SEND_HOST_LOOKUP_FAILED: + message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name); + break; + case TNY_TRANSPORT_ACCOUNT_ERROR_SEND_SERVICE_UNAVAILABLE: + message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name); + break; + case TNY_TRANSPORT_ACCOUNT_ERROR_SEND_AUTHENTICATION_NOT_SUPPORTED: + message = g_strdup_printf (_("emev_ni_ui_smtp_authentication_fail_error"), server_name); + break; + case TNY_TRANSPORT_ACCOUNT_ERROR_SEND: + message = g_strdup (_("emev_ib_ui_smtp_send_error")); + break; + default: + g_return_if_reached (); + } + + /* TODO if the username or the password where not defined we + should show the Accounts Settings dialog or the Connection + specific SMTP server window */ + + modest_platform_run_information_dialog (NULL, message); + g_free (message); } +void +modest_ui_actions_on_send_queue_status_changed (ModestTnySendQueue *send_queue, + gchar *msg_id, + guint status, + gpointer user_data) +{ + ModestMainWindow *main_window = NULL; + ModestWindowMgr *mgr = NULL; + GtkWidget *folder_view = NULL, *header_view = NULL; + TnyFolderStore *selected_folder = NULL; + TnyFolderType folder_type; + + mgr = modest_runtime_get_window_mgr (); + main_window = MODEST_MAIN_WINDOW (modest_window_mgr_get_main_window (mgr)); + + if (!main_window) + return; + + /* Check if selected folder is OUTBOX */ + folder_view = modest_main_window_get_child_widget (main_window, + MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); + header_view = modest_main_window_get_child_widget (main_window, + MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); + selected_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); + if (!TNY_IS_FOLDER (selected_folder)) + goto frees; + + /* gtk_tree_view_column_queue_resize is only available in GTK+ 2.8 */ +#if GTK_CHECK_VERSION(2, 8, 0) + folder_type = modest_tny_folder_guess_folder_type (TNY_FOLDER (selected_folder)); + if (folder_type == TNY_FOLDER_TYPE_OUTBOX) { + GtkTreeViewColumn *tree_column; + + tree_column = gtk_tree_view_get_column (GTK_TREE_VIEW (header_view), + TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN); + gtk_tree_view_column_queue_resize (tree_column); + } +#else + gtk_widget_queue_draw (header_view); +#endif + + /* Free */ + frees: + if (selected_folder != NULL) + g_object_unref (selected_folder); +}