X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=a0f44e6e4fc2c8033a45e9a65dc7940c06e997c5;hb=ad121a55b2da2b5af393ffe8b98fb77db9b00c53;hp=de39900531a37ab77c40afe611b49260daa09e40;hpb=a34dd9b7789c35778f0ccc7bbf16a8f322427247;p=modest diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index de39900..a0f44e6 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -197,6 +197,8 @@ msgs_already_deleted_from_server (TnyList *headers, const TnyFolderStore *src_fo 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. */ @@ -204,25 +206,39 @@ gboolean modest_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 + GtkDialog *wizard, *dialog; + + /* Show the easy-setup wizard: */ + dialog = modest_window_mgr_get_modal_dialog (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_DIALOG(modest_easysetup_wizard_dialog_new ()); + if (!wizard) { + g_printerr ("modest: failed to create easysetup wizard\n"); + return FALSE; + } + modest_window_mgr_set_modal_dialog + (modest_runtime_get_window_mgr(), GTK_DIALOG(wizard)); + + + /* there is no such wizard yet */ + wizard = GTK_DIALOG(modest_easysetup_wizard_dialog_new ()); + modest_window_mgr_set_modal_dialog (modest_runtime_get_window_mgr(), + GTK_DIALOG(wizard)); + + /* make it non-modal; if though we register it as a modal dialog above + * apparently, making it modal *at all* gives hangs -- FIXME: check this*/ + gtk_window_set_modal (GTK_WINDOW(dialog), FALSE); + /* 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 */ @@ -251,7 +267,7 @@ modest_run_account_setup_wizard (ModestWindow *win) gtk_widget_destroy (GTK_WIDGET (wizard)); /* clear it from the window mgr */ - modest_window_mgr_set_easysetup_dialog + modest_window_mgr_set_modal_dialog (modest_runtime_get_window_mgr(), NULL); return result; @@ -301,7 +317,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)) { @@ -385,29 +401,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); } } @@ -429,7 +435,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; } @@ -441,31 +447,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; } @@ -528,7 +533,9 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) 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)); if (MODEST_IS_MSG_VIEW_WINDOW (win)) { @@ -594,7 +601,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; @@ -924,7 +931,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); @@ -978,7 +985,7 @@ 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); +/* printf ("DEBUG: %s: Error: code=%d, text=%s\n", __FUNCTION__, error->code, error->message); */ if (error->code == MODEST_MAIL_OPERATION_ERROR_MESSAGE_SIZE_LIMIT) { @@ -1461,7 +1468,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; @@ -1484,7 +1491,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; @@ -1505,7 +1512,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")); @@ -1530,10 +1537,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)); @@ -1545,7 +1557,7 @@ new_messages_arrived (ModestMailOperation *self, } /* Notify new messages have been downloaded */ - if (tny_list_get_length (new_headers) > 0) { + if ((new_headers != NULL) && (tny_list_get_length (new_headers) > 0)) { TnyIterator *iter = tny_list_create_iterator (new_headers); do { TnyHeader *header = NULL; @@ -1571,6 +1583,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: */ @@ -1586,6 +1599,18 @@ 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)); @@ -1719,7 +1744,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; @@ -1728,7 +1753,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 @@ -1776,7 +1801,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; @@ -1815,7 +1840,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)); @@ -1901,7 +1926,7 @@ 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; @@ -1934,7 +1959,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; @@ -2469,7 +2494,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; @@ -2511,12 +2536,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; @@ -2593,7 +2618,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; @@ -2602,12 +2627,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)); @@ -2616,7 +2641,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 */ @@ -2657,21 +2682,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 @@ -3024,11 +3051,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)); } @@ -3133,10 +3157,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 (GTK_WINDOW (window), + TNY_FOLDER (folder_store), + delete, + data); if (response == GTK_RESPONSE_OK) { /* Launch notification */ @@ -3152,7 +3177,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); @@ -3172,7 +3197,7 @@ modest_ui_actions_on_paste (GtkAction *action, src_folder, folder_store, delete, - paste_msgs_cb, + destroy_information_note, inf_note); } @@ -3216,7 +3241,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 */ @@ -3430,7 +3455,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)); @@ -3449,7 +3474,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); } @@ -3619,7 +3644,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; } @@ -3820,10 +3845,10 @@ has_retrieved_msgs (TnyList *list) * 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 (GtkWindow *win, + TnyFolder *dest_folder, + gboolean delete, + TnyList *headers) { gint response = GTK_RESPONSE_OK; @@ -3868,20 +3893,26 @@ msgs_move_to_confirmation (GtkWindow *win, 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)); + /* 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)); + } + g_object_unref (object); } + + /* Close the "Pasting" information banner */ gtk_widget_destroy (GTK_WIDGET(user_data)); } @@ -3889,7 +3920,7 @@ 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; @@ -3904,11 +3935,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 */ @@ -3980,6 +4014,8 @@ open_msg_for_purge_cb (ModestMailOperation *mail_op, tny_iterator_next (iter); } + g_object_unref (iter); + if (pending_purges>0) { gint response; @@ -3987,7 +4023,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; @@ -4006,26 +4042,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); } @@ -4044,7 +4064,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)); @@ -4177,7 +4197,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)) { @@ -4214,7 +4234,7 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action, modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(win), modest_ui_actions_move_folder_error_handler, - win); + src_folder); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); @@ -4226,7 +4246,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, + inf_note); /* Unref mail operation */ g_object_unref (G_OBJECT (mail_op)); } @@ -4300,7 +4322,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; @@ -4443,7 +4465,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 */ @@ -4538,6 +4560,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) { @@ -4635,3 +4667,103 @@ _on_send_receive_progress_changed (ModestMailOperation *mail_op, } +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); +}