X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=fd84c02ad820c6b0b292f0a3439272a7a5996382;hp=777ec61eac2d1bfb13bd7b20dc94d34caba2cefc;hb=2b001be510aeb979f44dd256664a61edb57ece6f;hpb=352a6bf081e20503a412375644f289ead17702d5 diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index 777ec61..fd84c02 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -159,6 +159,12 @@ static gboolean remote_folder_is_pop (const TnyFolderStore *folder); static gboolean msgs_already_deleted_from_server ( TnyList *headers, const TnyFolderStore *src_folder); +static void do_create_folder (GtkWindow *window, + TnyFolderStore *parent_folder, + const gchar *suggested_name); + +static GtkWidget* get_folder_view_from_move_to_dialog (GtkWidget *move_to_dialog); + /* * This function checks whether a TnyFolderStore is a pop account @@ -740,8 +746,7 @@ modest_ui_actions_compose_msg(ModestWindow *win, ModestAccountMgr *mgr = modest_runtime_get_account_mgr(); ModestTnyAccountStore *store = modest_runtime_get_account_store(); - if (win) account_name = g_strdup (modest_window_get_active_account (win)); - if (!account_name) account_name = modest_account_mgr_get_default_account(mgr); + account_name = modest_account_mgr_get_default_account(mgr); if (!account_name) { g_printerr ("modest: no account found\n"); goto cleanup; @@ -784,11 +789,6 @@ modest_ui_actions_compose_msg(ModestWindow *win, attachments = g_slist_next(attachments); } modest_window_mgr_register_window (modest_runtime_get_window_mgr(), msg_win); - - if (win) { - gtk_window_set_transient_for (GTK_WINDOW (msg_win), - GTK_WINDOW (win)); - } gtk_widget_show_all (GTK_WIDGET (msg_win)); cleanup: @@ -813,6 +813,26 @@ modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win) modest_ui_actions_compose_msg(win, NULL, NULL, NULL, NULL, NULL, NULL); } +void +modest_ui_actions_on_new_msg_or_folder (GtkAction *action, ModestWindow *win) +{ + g_return_if_fail (MODEST_IS_WINDOW (win)); + + /* Check first if the folder view has the focus */ + if (MODEST_IS_MAIN_WINDOW (win)) { + GtkWidget *w; + w = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), + MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); + if (gtk_widget_is_focus (w)) { + modest_ui_actions_on_new_folder (action, MODEST_MAIN_WINDOW(win)); + return; + } + } + + modest_ui_actions_on_new_msg (action, win); +} + + gboolean modest_ui_actions_msg_retrieval_check (ModestMailOperation *mail_op, TnyHeader *header, @@ -936,7 +956,8 @@ open_msg_cb (ModestMailOperation *mail_op, /* Show banner */ - modest_platform_information_banner (NULL, NULL, _("mail_ib_opening_draft_message")); + modest_platform_information_banner_with_timeout + (NULL, NULL, _("mail_ib_opening_draft_message"), 1200); } else { gchar *uid = modest_tny_folder_get_header_unique_id (header); @@ -999,16 +1020,10 @@ modest_ui_actions_get_msgs_full_error_handler (ModestMailOperation *mail_op, { const GError *error; GObject *win = NULL; - const gchar *err_msg; + const gchar *err_msg = (const gchar *) user_data; win = modest_mail_operation_get_source (mail_op); error = modest_mail_operation_get_error (mail_op); - - /* Select error message */ - if (error->code == MODEST_MAIL_OPERATION_ERROR_MESSAGE_SIZE_LIMIT) - err_msg = _("emev_ni_ui_imap_msg_size_exceed_error"); - else - err_msg = (const gchar *) user_data; /* Show error */ modest_platform_run_information_dialog ((GtkWindow *) win, err_msg); @@ -1038,6 +1053,16 @@ get_account_from_header_list (TnyList *headers) return account; } +static void +foreach_unregister_headers (gpointer data, + gpointer user_data) +{ + ModestWindowMgr *mgr = (ModestWindowMgr *) user_data; + TnyHeader *header = TNY_HEADER (data); + + modest_window_mgr_unregister_header (mgr, header); +} + static void open_msgs_performer(gboolean canceled, GError *err, @@ -1055,8 +1080,10 @@ open_msgs_performer(gboolean canceled, not_opened_headers = TNY_LIST (user_data); status = tny_account_get_connection_status (account); - if (err || canceled || status != TNY_CONNECTION_STATUS_CONNECTED) { - /* TODO: Show an error ? */ + if (err || canceled) { + /* Unregister the already registered headers */ + tny_list_foreach (not_opened_headers, foreach_unregister_headers, + modest_runtime_get_window_mgr ()); goto clean; } @@ -1220,7 +1247,7 @@ open_msgs_from_headers (TnyList *headers, ModestWindow *win) /* Connect to the account and perform */ if (uncached_msgs > 0) { - modest_platform_connect_and_perform ((GtkWindow *) win, g_object_ref (account), + modest_platform_connect_and_perform ((GtkWindow *) win, TRUE, g_object_ref (account), open_msgs_performer, g_object_ref (not_opened_headers)); } else { /* Call directly the performer, do not need to connect */ @@ -1636,17 +1663,44 @@ new_messages_arrived (ModestMailOperation *self, gpointer user_data) { GObject *source; + gboolean show_visual_notifications; source = modest_mail_operation_get_source (self); - - /* Notify new messages have been downloaded. Do not notify if - the send&receive was invoked by the user, i.e, if the mail - operation has a source (the main window) */ - if ((new_headers != NULL) && (tny_list_get_length (new_headers) > 0) && !source) - modest_platform_on_new_headers_received (new_headers); - + show_visual_notifications = (source) ? FALSE : TRUE; if (source) g_object_unref (source); + + /* Notify new messages have been downloaded. If the + send&receive was invoked by the user then do not show any + visual notification, only play a sound and activate the LED + (for the Maemo version) */ + if ((new_headers != NULL) && (tny_list_get_length (new_headers) > 0)) + modest_platform_on_new_headers_received (new_headers, + show_visual_notifications); + +} + +gboolean +retrieve_all_messages_cb (GObject *source, + guint num_msgs, + guint retrieve_limit) +{ + GtkWindow *window; + gchar *msg; + gint response; + + window = GTK_WINDOW (source); + msg = g_strdup_printf (_("mail_nc_msg_count_limit_exceeded"), + num_msgs, retrieve_limit); + + /* Ask the user if they want to retrieve all the messages */ + response = + modest_platform_run_confirmation_dialog_with_buttons (window, msg, + _("mcen_bd_get_all"), + _("mcen_bd_newest_only")); + /* Free and return */ + g_free (msg); + return (response == GTK_RESPONSE_ACCEPT) ? TRUE : FALSE; } typedef struct { @@ -1668,7 +1722,6 @@ do_send_receive_performer (gboolean canceled, info = (SendReceiveInfo *) user_data; if (err || canceled) { - goto clean; } @@ -1677,7 +1730,7 @@ do_send_receive_performer (gboolean canceled, modest_main_window_notify_send_receive_initied (MODEST_MAIN_WINDOW (info->win)); } - mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT (info->win), + mail_op = modest_mail_operation_new_with_error_handling ((info->win) ? G_OBJECT (info->win) : NULL, modest_ui_actions_send_receive_error_handler, NULL, NULL); @@ -1689,6 +1742,7 @@ do_send_receive_performer (gboolean canceled, /* Send & receive. */ modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); modest_mail_operation_update_account (mail_op, info->account_name, (info->win) ? FALSE : TRUE, + (info->win) ? retrieve_all_messages_cb : NULL, new_messages_arrived, info->win); g_object_unref (G_OBJECT (mail_op)); @@ -1711,6 +1765,7 @@ do_send_receive_performer (gboolean canceled, */ void modest_ui_actions_do_send_receive (const gchar *account_name, + gboolean force_connection, ModestWindow *win) { gchar *acc_name = NULL; @@ -1742,7 +1797,8 @@ modest_ui_actions_do_send_receive (const gchar *account_name, TNY_ACCOUNT_TYPE_STORE); /* Invoke the connect and perform */ - modest_platform_connect_and_perform ((win) ? GTK_WINDOW (win) : NULL, info->account, + modest_platform_connect_and_perform ((win) ? GTK_WINDOW (win) : NULL, + force_connection, info->account, do_send_receive_performer, info); } @@ -1821,7 +1877,8 @@ modest_ui_actions_cancel_send (GtkAction *action, ModestWindow *win) * updates */ void -modest_ui_actions_do_send_receive_all (ModestWindow *win) +modest_ui_actions_do_send_receive_all (ModestWindow *win, + gboolean force_connection) { GSList *account_names, *iter; @@ -1830,7 +1887,7 @@ modest_ui_actions_do_send_receive_all (ModestWindow *win) iter = account_names; while (iter) { - modest_ui_actions_do_send_receive ((const char*) iter->data, win); + modest_ui_actions_do_send_receive ((const char*) iter->data, force_connection, win); iter = g_slist_next (iter); } @@ -1856,7 +1913,7 @@ modest_ui_actions_on_send_receive (GtkAction *action, ModestWindow *win) /* Refresh the current folder. The if is always TRUE it's just an extra check */ if (MODEST_IS_MAIN_WINDOW (win)) { - GtkWidget *header_view, *folder_view; + GtkWidget *folder_view; TnyFolderStore *folder_store; folder_view = @@ -1867,29 +1924,12 @@ modest_ui_actions_on_send_receive (GtkAction *action, ModestWindow *win) folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); - /* No need to refresh the INBOX the send_receive will do it for us */ - if (folder_store && TNY_IS_FOLDER (folder_store) && - tny_folder_get_folder_type (TNY_FOLDER (folder_store)) != TNY_FOLDER_TYPE_INBOX) { - header_view = - modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), - 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 - need to save the widget status. Just force - a refresh */ - modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view), - TNY_FOLDER (folder_store), - folder_refreshed_cb, - MODEST_MAIN_WINDOW (win)); - } - if (folder_store) g_object_unref (folder_store); } - /* Refresh the active account */ - modest_ui_actions_do_send_receive (NULL, win); + /* Refresh the active account. Force the connection if needed */ + modest_ui_actions_do_send_receive (NULL, TRUE, win); } @@ -1968,7 +2008,7 @@ modest_ui_actions_on_header_activated (ModestHeaderView *header_view, TnyList *headers; g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window)); - + if (!header) return; @@ -2025,8 +2065,6 @@ folder_refreshed_cb (ModestMailOperation *mail_op, { ModestMainWindow *win = NULL; GtkWidget *header_view; - gboolean folder_empty = FALSE; - gboolean all_marked_as_deleted = FALSE; g_return_if_fail (TNY_IS_FOLDER (folder)); @@ -2041,14 +2079,12 @@ folder_refreshed_cb (ModestMailOperation *mail_op, if (current_folder != NULL && folder != current_folder) { g_object_unref (current_folder); return; - } - g_object_unref (current_folder); + } else if (current_folder) + g_object_unref (current_folder); } /* Check if folder is empty and set headers view contents style */ - folder_empty = (tny_folder_get_all_count (folder) == 0); - all_marked_as_deleted = modest_header_view_is_empty (MODEST_HEADER_VIEW(header_view)); - if (folder_empty || all_marked_as_deleted) + if (tny_folder_get_all_count (folder) == 0) modest_main_window_set_contents_style (win, MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY); } @@ -2233,11 +2269,16 @@ on_save_to_drafts_cb (ModestMailOperation *mail_op, 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); + /* It might not be a good idea to do nothing if there was an error, + * so let's at least show a generic error banner. */ + /* TODO error while saving attachment, show "Saving draft failed" banner */ + if (modest_mail_operation_get_error (mail_op) != NULL) { + g_warning ("%s failed: %s\n", __FUNCTION__, (modest_mail_operation_get_error (mail_op))->message); + modest_platform_information_banner (NULL, NULL, _("mail_ib_file_operation_failed")); + } else { + modest_msg_edit_window_set_draft (edit_window, saved_draft); + } + g_object_unref(edit_window); } void @@ -2284,7 +2325,7 @@ 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 (G_OBJECT(edit_window)); + mail_operation = modest_mail_operation_new (NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_operation); modest_mail_operation_save_to_drafts (mail_operation, @@ -2301,7 +2342,7 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi data->images, data->priority_flags, on_save_to_drafts_cb, - edit_window); + g_object_ref(edit_window)); info_text = g_strdup_printf (_("mail_va_saved_to_drafts"), _("mcen_me_folder_drafts")); modest_platform_information_banner (NULL, NULL, info_text); @@ -2372,7 +2413,7 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) ModestAccountMgr *account_mgr = modest_runtime_get_account_mgr(); gchar *account_name = g_strdup (data->account_name); if (!account_name) - g_strdup(modest_window_get_active_account (MODEST_WINDOW(edit_window))); + account_name = g_strdup(modest_window_get_active_account (MODEST_WINDOW(edit_window))); if (!account_name) account_name = modest_account_mgr_get_default_account (account_mgr); @@ -2380,8 +2421,9 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) if (!account_name) { modest_msg_edit_window_free_msg_data (edit_window, data); /* Run account setup wizard */ - if (!modest_ui_actions_run_account_setup_wizard (MODEST_WINDOW(edit_window))) + if (!modest_ui_actions_run_account_setup_wizard (MODEST_WINDOW(edit_window))) { return; + } } /* Get the currently-active transport account for this modest account: */ @@ -2392,6 +2434,7 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) } if (!transport_account) { + modest_msg_edit_window_free_msg_data (edit_window, data); /* Run account setup wizard */ if (!modest_ui_actions_run_account_setup_wizard(MODEST_WINDOW(edit_window))) return; @@ -2400,7 +2443,7 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) gchar *from = modest_account_mgr_get_from_string (account_mgr, account_name); /* Create the mail operation */ - ModestMailOperation *mail_operation = modest_mail_operation_new (G_OBJECT(edit_window)); + ModestMailOperation *mail_operation = modest_mail_operation_new (NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_operation); modest_mail_operation_send_new_mail (mail_operation, @@ -2580,16 +2623,91 @@ modest_ui_actions_on_remove_attachments (GtkAction *action, } static void -modest_ui_actions_new_folder_error_handler (ModestMailOperation *mail_op, - gpointer user_data) +do_create_folder_cb (ModestMailOperation *mail_op, + TnyFolderStore *parent_folder, + TnyFolder *new_folder, + gpointer user_data) { - ModestMainWindow *window = MODEST_MAIN_WINDOW (user_data); - const GError *error = modest_mail_operation_get_error (mail_op); + gchar *suggested_name = (gchar *) user_data; + GtkWindow *source_win = (GtkWindow *) modest_mail_operation_get_source (mail_op); - if(error) { - modest_platform_information_banner (GTK_WIDGET (window), NULL, + if (modest_mail_operation_get_error (mail_op)) { + /* Show an error */ + modest_platform_information_banner (GTK_WIDGET (source_win), NULL, _("mail_in_ui_folder_create_error")); + + /* Try again */ + do_create_folder (source_win, parent_folder, (const gchar *) suggested_name); + } else { + /* the 'source_win' is either the ModestMainWindow, or the 'Move to folder'-dialog + * FIXME: any other? */ + GtkWidget *folder_view; + + if (MODEST_IS_MAIN_WINDOW(source_win)) + folder_view = + modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (source_win), + MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); + else + folder_view = + get_folder_view_from_move_to_dialog (GTK_WIDGET(source_win)); + + /* Select the newly created folder */ + modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view), + new_folder, FALSE); + g_object_unref (new_folder); + } + /* Free. Note that the first time it'll be NULL so noop */ + g_free (suggested_name); + g_object_unref (source_win); +} + +static void +do_create_folder (GtkWindow *parent_window, + TnyFolderStore *parent_folder, + const gchar *suggested_name) +{ + gint result; + gchar *folder_name = NULL; + + result = modest_platform_run_new_folder_dialog (GTK_WINDOW (parent_window), + parent_folder, + (gchar *) suggested_name, + &folder_name); + + if (result == GTK_RESPONSE_ACCEPT) { + ModestMailOperation *mail_op; + + mail_op = modest_mail_operation_new (G_OBJECT(parent_window)); + + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), + mail_op); + modest_mail_operation_create_folder (mail_op, + parent_folder, + (const gchar *) folder_name, + do_create_folder_cb, + folder_name); + g_object_unref (mail_op); + } +} + +static void +create_folder_performer (gboolean canceled, + GError *err, + GtkWindow *parent_window, + TnyAccount *account, + gpointer user_data) +{ + TnyFolderStore *parent_folder = TNY_FOLDER_STORE (user_data); + + if (canceled || err) { + goto frees; } + + /* Run the new folder dialog */ + do_create_folder (GTK_WINDOW (parent_window), parent_folder, NULL); + + frees: + g_object_unref (parent_folder); } static void @@ -2601,65 +2719,12 @@ modest_ui_actions_create_folder(GtkWidget *parent_window, parent_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view)); if (parent_folder) { - gboolean finished = FALSE; - gint result; - gchar *folder_name = NULL, *suggested_name = NULL; - const gchar *proto_str = NULL; - TnyAccount *account; - - if (TNY_IS_ACCOUNT (parent_folder)) - account = g_object_ref (parent_folder); - else - account = tny_folder_get_account (TNY_FOLDER (parent_folder)); - proto_str = tny_account_get_proto (TNY_ACCOUNT (account)); - - if (proto_str && modest_protocol_info_get_transport_store_protocol (proto_str) == - MODEST_PROTOCOL_STORE_POP) { - finished = TRUE; - modest_platform_information_banner (NULL, NULL, _("mail_in_ui_folder_create_error")); - } - g_object_unref (account); - - /* Run the new folder dialog */ - while (!finished) { - result = modest_platform_run_new_folder_dialog (GTK_WINDOW (parent_window), - parent_folder, - suggested_name, - &folder_name); - - g_free (suggested_name); - suggested_name = NULL; - - if (result == GTK_RESPONSE_ACCEPT) { - ModestMailOperation *mail_op; - TnyFolder *new_folder = NULL; - - mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(parent_window), - modest_ui_actions_new_folder_error_handler, - parent_window, NULL); - - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), - mail_op); - new_folder = modest_mail_operation_create_folder (mail_op, - parent_folder, - (const gchar *) folder_name); - if (new_folder) { - modest_folder_view_select_folder (MODEST_FOLDER_VIEW(folder_view), - new_folder, TRUE); - - g_object_unref (new_folder); - finished = TRUE; - } - g_object_unref (mail_op); - } else { - finished = TRUE; - } - - suggested_name = folder_name; - folder_name = NULL; - } - - g_object_unref (parent_folder); + /* The parent folder will be freed in the callback */ + modest_platform_connect_if_remote_and_perform (GTK_WINDOW (parent_window), + TRUE, + parent_folder, + create_folder_performer, + parent_folder); } } @@ -2710,15 +2775,28 @@ typedef struct { } RenameFolderInfo; static void -on_rename_folder_cb (gboolean canceled, GError *err, GtkWindow *parent_window, - TnyAccount *account, gpointer user_data) +on_rename_folder_cb (ModestMailOperation *mail_op, + TnyFolder *new_folder, + gpointer user_data) +{ + /* Select now */ + modest_folder_view_select_folder (MODEST_FOLDER_VIEW (user_data), + new_folder, FALSE); +} + +static void +on_rename_folder_performer (gboolean canceled, + GError *err, + GtkWindow *parent_window, + TnyAccount *account, + gpointer user_data) { ModestMailOperation *mail_op = NULL; GtkTreeSelection *sel = NULL; GtkWidget *folder_view = NULL; RenameFolderInfo *data = (RenameFolderInfo*)user_data; - if (MODEST_IS_MAIN_WINDOW(parent_window)) { + if (!canceled && (err == NULL) && MODEST_IS_MAIN_WINDOW(parent_window)) { folder_view = modest_main_window_get_child_widget ( MODEST_MAIN_WINDOW (parent_window), @@ -2736,20 +2814,12 @@ on_rename_folder_cb (gboolean canceled, GError *err, GtkWindow *parent_window, sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_view)); gtk_tree_selection_unselect_all (sel); - /* Select *after* the changes */ - modest_folder_view_select_folder (MODEST_FOLDER_VIEW(folder_view), - TNY_FOLDER(data->folder), TRUE); - /* Actually rename the folder */ modest_mail_operation_rename_folder (mail_op, - TNY_FOLDER (data->folder), - (const gchar *) (data->new_name)); - - /* TODO folder view filter refilter */ - /* - GtkTreeModel *tree_model = gtk_tree_view_get_model (GTK_TREE_VIEW (folder_view)); - if (GTK_IS_TREE_MODEL_FILTER (tree_model)) - gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (tree_model)); */ + TNY_FOLDER (data->folder), + (const gchar *) (data->new_name), + on_rename_folder_cb, + folder_view); } g_object_unref (mail_op); @@ -2803,8 +2873,8 @@ modest_ui_actions_on_rename_folder (GtkAction *action, RenameFolderInfo *rename_folder_data = g_new0 (RenameFolderInfo, 1); rename_folder_data->folder = folder; rename_folder_data->new_name = folder_name; - modest_platform_connect_if_remote_and_perform (GTK_WINDOW(main_window), - folder, on_rename_folder_cb, rename_folder_data); + modest_platform_connect_if_remote_and_perform (GTK_WINDOW(main_window), TRUE, + folder, on_rename_folder_performer, rename_folder_data); } } g_object_unref (folder); @@ -2821,21 +2891,67 @@ modest_ui_actions_delete_folder_error_handler (ModestMailOperation *mail_op, g_object_unref (win); } -static gboolean -delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) +typedef struct { + TnyFolderStore *folder; + gboolean move_to_trash; +} DeleteFolderInfo; + +static void +on_delete_folder_cb (gboolean canceled, + GError *err, + GtkWindow *parent_window, + TnyAccount *account, + gpointer user_data) +{ + DeleteFolderInfo *info = (DeleteFolderInfo*) user_data; + GtkWidget *folder_view; + ModestMailOperation *mail_op; + GtkTreeSelection *sel; + + if (!MODEST_IS_MAIN_WINDOW(parent_window) || canceled || (err!=NULL)) { + g_object_unref (G_OBJECT (info->folder)); + g_free (info); + } + + folder_view = modest_main_window_get_child_widget ( + MODEST_MAIN_WINDOW (parent_window), + MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); + + /* Unselect the folder before deleting it to free the headers */ + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_view)); + gtk_tree_selection_unselect_all (sel); + + /* Create the mail operation */ + mail_op = + modest_mail_operation_new_with_error_handling (G_OBJECT(parent_window), + modest_ui_actions_delete_folder_error_handler, + NULL, NULL); + + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), + mail_op); + modest_mail_operation_remove_folder (mail_op, TNY_FOLDER (info->folder), info->move_to_trash); + + modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (folder_view)); + + g_object_unref (G_OBJECT (mail_op)); + g_object_unref (G_OBJECT (info->folder)); + g_free (info); +} + +static void +delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) { TnyFolderStore *folder; GtkWidget *folder_view; gint response; gchar *message; - gboolean do_delete = TRUE; - - g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (main_window), FALSE); + + g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window)); folder_view = modest_main_window_get_child_widget (main_window, MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); if (!folder_view) - return FALSE; + return; folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); @@ -2844,7 +2960,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 FALSE; + return; } /* Ask the user */ @@ -2854,38 +2970,20 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) (const gchar *) message); g_free (message); - if (response != GTK_RESPONSE_OK) { - do_delete = FALSE; - } else if (modest_tny_folder_store_is_remote(folder) && - !tny_device_is_online (modest_runtime_get_device())) { - TnyAccount *account = tny_folder_get_account(TNY_FOLDER(folder)); - do_delete = modest_platform_connect_and_wait(GTK_WINDOW(main_window), account); - g_object_unref(account); - } - - if (do_delete) { - ModestMailOperation *mail_op; - GtkTreeSelection *sel; - - /* Unselect the folder before deleting it to free the headers */ - sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_view)); - gtk_tree_selection_unselect_all (sel); - - /* Create the mail operation */ - mail_op = - modest_mail_operation_new_with_error_handling (G_OBJECT(main_window), - modest_ui_actions_delete_folder_error_handler, - NULL, NULL); - - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), - mail_op); - modest_mail_operation_remove_folder (mail_op, TNY_FOLDER (folder), move_to_trash); - g_object_unref (G_OBJECT (mail_op)); + if (response == GTK_RESPONSE_OK) { + DeleteFolderInfo *info; + info = g_new0(DeleteFolderInfo, 1); + info->folder = folder; + info->move_to_trash = move_to_trash; + g_object_ref (G_OBJECT (info->folder)); + TnyAccount *account = tny_folder_get_account (TNY_FOLDER (folder)); + modest_platform_connect_if_remote_and_perform (GTK_WINDOW (main_window), + TRUE, + TNY_FOLDER_STORE (account), + on_delete_folder_cb, info); + g_object_unref (account); } - g_object_unref (G_OBJECT (folder)); - - return do_delete; } void @@ -2893,14 +2991,8 @@ modest_ui_actions_on_delete_folder (GtkAction *action, ModestMainWindow *main_window) { g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window)); - - 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)); - } + + delete_folder (main_window, FALSE); } void @@ -3258,7 +3350,17 @@ modest_ui_actions_on_redo (GtkAction *action, static void -destroy_information_note (ModestMailOperation *mail_op, gpointer user_data) +destroy_information_note (ModestMailOperation *mail_op, + gpointer user_data) +{ + /* destroy information note */ + gtk_widget_destroy (GTK_WIDGET(user_data)); +} + +static void +destroy_folder_information_note (ModestMailOperation *mail_op, + TnyFolder *new_folder, + gpointer user_data) { /* destroy information note */ gtk_widget_destroy (GTK_WIDGET(user_data)); @@ -3403,7 +3505,7 @@ modest_ui_actions_on_paste (GtkAction *action, src_folder, folder_store, delete, - destroy_information_note, + destroy_folder_information_note, inf_note); } @@ -3745,18 +3847,27 @@ modest_ui_actions_msg_edit_on_select_font (GtkAction *action, modest_msg_edit_window_select_font (window); } + void modest_ui_actions_on_folder_display_name_changed (ModestFolderView *folder_view, const gchar *display_name, GtkWindow *window) { + /* don't update the display name if it was already set; + * updating the display name apparently is expensive */ + const gchar* old_name = gtk_window_get_title (window); + + if (display_name == NULL) + display_name = " "; + + if (old_name && display_name && strcmp (old_name, display_name) == 0) + return; /* don't do anything */ + /* This is usually used to change the title of the main window, which * is the one that holds the folder view. Note that this change can * happen even when the widget doesn't have the focus. */ - if (display_name) - gtk_window_set_title (window, display_name); - else - gtk_window_set_title (window, " "); + gtk_window_set_title (window, display_name); + } void @@ -3910,6 +4021,16 @@ on_move_to_dialog_folder_selection_changed (ModestFolderView* self, gtk_widget_set_sensitive (new_button, new_sensitive); } + +#define MODEST_MOVE_TO_DIALOG_FOLDER_VIEW "move-to-dialog-folder-view" + +static GtkWidget* +get_folder_view_from_move_to_dialog (GtkWidget *move_to_dialog) +{ + return GTK_WIDGET(g_object_get_data (G_OBJECT(move_to_dialog), + MODEST_MOVE_TO_DIALOG_FOLDER_VIEW)); +} + static GtkWidget* create_move_to_dialog (GtkWindow *win, GtkWidget *folder_view, @@ -3998,9 +4119,16 @@ create_move_to_dialog (GtkWindow *win, } } + /* we keep a pointer to the embedded folder view, so we can retrieve it with + * get_folder_view_from_move_to_dialog + * (see above) later (needed for focus handling) + */ + g_object_set_data (G_OBJECT(dialog), MODEST_MOVE_TO_DIALOG_FOLDER_VIEW, *tree_view); + + /* Hide special folders */ modest_folder_view_show_non_move_folders (MODEST_FOLDER_VIEW (*tree_view), FALSE); - + gtk_container_add (GTK_CONTAINER (scroll), *tree_view); /* Add scroll to dialog */ @@ -4110,10 +4238,9 @@ modest_ui_actions_msgs_move_to_confirmation (ModestWindow *win, return response; } - - static void -move_to_cb (ModestMailOperation *mail_op, gpointer user_data) +move_to_cb (ModestMailOperation *mail_op, + gpointer user_data) { MoveToHelper *helper = (MoveToHelper *) user_data; @@ -4152,22 +4279,27 @@ move_to_cb (ModestMailOperation *mail_op, gpointer user_data) g_free (helper); } +static void +folder_move_to_cb (ModestMailOperation *mail_op, + TnyFolder *new_folder, + gpointer user_data) +{ + move_to_cb (mail_op, user_data); +} + +static void +msgs_move_to_cb (ModestMailOperation *mail_op, + gpointer user_data) +{ + move_to_cb (mail_op, user_data); +} + void modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op, gpointer user_data) { ModestWindow *main_window = NULL; GObject *win = NULL; - const GError *error = NULL; - const gchar *message = NULL; - - /* Get error message */ - error = modest_mail_operation_get_error (mail_op); - if (error != NULL && error->message != NULL) { - message = error->message; - } else { - message = _("mail_in_ui_folder_move_target_error"); - } /* Disable next automatic folder selection */ main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), @@ -4187,7 +4319,7 @@ modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op, /* Show notification dialog */ win = modest_mail_operation_get_source (mail_op); - modest_platform_run_information_dialog ((GtkWindow *) win, message); + modest_platform_run_information_dialog ((GtkWindow *) win, _("mail_in_ui_folder_move_target_error")); if (win) g_object_unref (win); } @@ -4363,18 +4495,19 @@ modest_ui_actions_on_main_window_remove_attachments (GtkAction *action, * and the msg view window when using the "Move to" dialog */ static void -modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder, - ModestWindow *win) +xfer_messages_from_move_to_cb (gboolean canceled, GError *err, + GtkWindow *parent_window, + TnyAccount *account, gpointer user_data) { + TnyFolderStore *dst_folder = TNY_FOLDER_STORE (user_data); + ModestWindow *win = MODEST_WINDOW (parent_window); TnyList *headers = NULL; TnyAccount *dst_account = NULL; const gchar *proto_str = NULL; gboolean dst_is_pop = FALSE; - if (!TNY_IS_FOLDER (dst_folder)) { - modest_platform_information_banner (GTK_WIDGET (win), - NULL, - _CS("ckdg_ib_unable_to_move_to_current_location")); + if (canceled || err) { + g_object_unref (dst_folder); return; } @@ -4432,11 +4565,115 @@ modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder, headers, TNY_FOLDER (dst_folder), TRUE, - move_to_cb, + msgs_move_to_cb, helper); g_object_unref (G_OBJECT (mail_op)); g_object_unref (headers); + g_object_unref (dst_folder); +} + +typedef struct { + TnyAccount *dst_account; + ModestConnectedPerformer callback; + gpointer data; +} DoubleConnectionInfo; + +static void +src_account_connect_performer (gboolean canceled, + GError *err, + GtkWindow *parent_window, + TnyAccount *src_account, + gpointer user_data) +{ + DoubleConnectionInfo *info = (DoubleConnectionInfo *) user_data; + + if (canceled || err) { + /* If there was any error call the user callback */ + info->callback (canceled, err, parent_window, src_account, info->data); + } else { + /* Connect the destination account */ + modest_platform_connect_if_remote_and_perform (parent_window, TRUE, + TNY_FOLDER_STORE (info->dst_account), + info->callback, info->data); + } + + /* Free the info object */ + g_object_unref (info->dst_account); + g_slice_free (DoubleConnectionInfo, info); +} + +typedef struct { + TnyFolder *src_folder; + TnyFolderStore *dst_folder; + gboolean delete_original; + GtkWidget *folder_view; +} MoveFolderInfo; + +static void +on_move_folder_cb (gboolean canceled, GError *err, GtkWindow *parent_window, + TnyAccount *account, gpointer user_data) +{ + MoveFolderInfo *info = (MoveFolderInfo*)user_data; + GtkTreeSelection *sel; + ModestMailOperation *mail_op = NULL; + + if (canceled || err || !MODEST_IS_MAIN_WINDOW (parent_window)) { + g_object_unref (G_OBJECT (info->src_folder)); + g_object_unref (G_OBJECT (info->dst_folder)); + g_free (info); + return; + } + + MoveToHelper *helper = g_new0 (MoveToHelper, 1); + helper->banner = modest_platform_animation_banner (GTK_WIDGET (parent_window), 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 (info->folder_view)); + gtk_tree_selection_unselect_all (sel); + + /* Let gtk events run. We need that the folder + view frees its reference to the source + folder *before* issuing the mail operation + so we need the signal handler of selection + changed to happen before the mail + operation + while (gtk_events_pending ()) + gtk_main_iteration (); */ + + mail_op = + modest_mail_operation_new_with_error_handling (G_OBJECT(parent_window), + modest_ui_actions_move_folder_error_handler, + info->src_folder, NULL); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), + mail_op); + + /* Select *after* the changes */ + /* TODO: this function hangs UI after transfer */ + /* modest_folder_view_select_folder (MODEST_FOLDER_VIEW(folder_view), */ + /* TNY_FOLDER (src_folder), TRUE); */ + + modest_mail_operation_xfer_folder (mail_op, + TNY_FOLDER (info->src_folder), + info->dst_folder, + info->delete_original, + folder_move_to_cb, + helper); + + if (modest_mail_operation_get_status (mail_op) == MODEST_MAIL_OPERATION_STATUS_SUCCESS) { + modest_folder_view_select_folder (MODEST_FOLDER_VIEW(info->folder_view), + TNY_FOLDER (info->dst_folder), TRUE); + } + + /* Unref mail operation */ + g_object_unref (G_OBJECT (mail_op)); + g_object_unref (G_OBJECT (info->src_folder)); + g_object_unref (G_OBJECT (info->dst_folder)); + g_free (user_data); } /* @@ -4450,9 +4687,8 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action, ModestMainWindow *win) { ModestHeaderView *header_view = NULL; - ModestMailOperation *mail_op = NULL; TnyFolderStore *src_folder; - gboolean online = (tny_device_is_online (modest_runtime_get_device())); + gboolean online = (tny_device_is_online (modest_runtime_get_device())); g_return_if_fail (MODEST_IS_MAIN_WINDOW (win)); @@ -4464,86 +4700,80 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action, /* Get folder or messages to transfer */ if (gtk_widget_is_focus (folder_view)) { - GtkTreeSelection *sel; - gboolean do_xfer = TRUE; + gboolean do_xfer = TRUE; /* Allow only to transfer folders to the local root folder */ if (TNY_IS_ACCOUNT (dst_folder) && !MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (dst_folder)) { do_xfer = FALSE; - } else if (!TNY_IS_FOLDER (src_folder)) { + } else if (!TNY_IS_FOLDER (src_folder)) { g_warning ("%s: src_folder is not a TnyFolder.\n", __FUNCTION__); - do_xfer = FALSE; - } else if (!online && modest_tny_folder_store_is_remote(src_folder)) { - guint num_headers = tny_folder_get_all_count(TNY_FOLDER (src_folder)); + do_xfer = FALSE; + } /* else if (!online && modest_tny_folder_store_is_remote(src_folder)) { + 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; + if (!connect_to_get_msg(MODEST_WINDOW (win), num_headers, account)) + do_xfer = FALSE; g_object_unref (account); - } - - if (do_xfer) { - 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); - - /* Let gtk events run. We need that the folder - view frees its reference to the source - folder *before* issuing the mail operation - so we need the signal handler of selection - changed to happen before the mail - operation */ - while (gtk_events_pending ()) - gtk_main_iteration (); - - mail_op = - modest_mail_operation_new_with_error_handling (G_OBJECT(win), - modest_ui_actions_move_folder_error_handler, - src_folder, NULL); - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), - mail_op); - - /* Select *after* the changes */ - /* TODO: this function hangs UI after transfer */ -/* modest_folder_view_select_folder (MODEST_FOLDER_VIEW(folder_view), */ -/* TNY_FOLDER (src_folder), TRUE); */ - - modest_mail_operation_xfer_folder (mail_op, - TNY_FOLDER (src_folder), - dst_folder, - TRUE, - move_to_cb, - helper); - /* Unref mail operation */ - g_object_unref (G_OBJECT (mail_op)); - } + }*/ + + if (do_xfer) { + MoveFolderInfo *info = g_new0 (MoveFolderInfo, 1); + info->src_folder = TNY_FOLDER (src_folder); + info->dst_folder = dst_folder; + info->delete_original = TRUE; + info->folder_view = folder_view; + g_object_ref (G_OBJECT (info->src_folder)); + g_object_ref (G_OBJECT (info->dst_folder)); + modest_platform_connect_if_remote_and_perform(GTK_WINDOW (win), TRUE, + TNY_FOLDER_STORE (dst_folder), on_move_folder_cb, info); + } } else if (gtk_widget_is_focus (GTK_WIDGET(header_view))) { - gboolean do_xfer = TRUE; - /* Ask for confirmation if the source folder is remote and we're not connected */ - if (!online && modest_tny_folder_store_is_remote(src_folder)) { - 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); + gboolean do_xfer = TRUE; + + /* Show an error when trying to move msgs to an account */ + if (!TNY_IS_FOLDER (dst_folder)) { + modest_platform_information_banner (GTK_WIDGET (win), + NULL, + _CS("ckdg_ib_unable_to_move_to_current_location")); + goto free; + } + + /* Ask for confirmation if the source folder is remote and we're not connected */ + if (!online && modest_tny_folder_store_is_remote(src_folder)) { + 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; + GtkResponseType response; + + response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win), + ngettext("mcen_nc_get_msg", + "mcen_nc_get_msgs", + num_headers)); + if (response == GTK_RESPONSE_CANCEL) + 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)); + } + g_object_unref(headers); + } + if (do_xfer) /* Transfer messages */ { + DoubleConnectionInfo *info = g_slice_new (DoubleConnectionInfo); + info->callback = xfer_messages_from_move_to_cb; + info->dst_account = tny_folder_get_account (TNY_FOLDER (dst_folder)); + info->data = g_object_ref (dst_folder); + + modest_platform_connect_if_remote_and_perform(GTK_WINDOW (win), TRUE, + TNY_FOLDER_STORE (src_folder), + src_account_connect_performer, + info); + } } - if (src_folder) - g_object_unref (src_folder); + free: + if (src_folder) + g_object_unref (src_folder); } @@ -4580,7 +4810,9 @@ modest_ui_actions_on_msg_view_window_move_to (GtkAction *action, } if (do_xfer) { - modest_ui_actions_xfer_messages_from_move_to (dst_folder, MODEST_WINDOW (win)); + g_object_ref (dst_folder); + modest_platform_connect_if_remote_and_perform(GTK_WINDOW (win), TRUE, + TNY_FOLDER_STORE (dst_folder), xfer_messages_from_move_to_cb, dst_folder); } g_object_unref (account); g_object_unref (src_folder); @@ -4625,17 +4857,17 @@ modest_ui_actions_on_move_to (GtkAction *action, return; dst_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (tree_view)); - /* Do window specific stuff */ - if (MODEST_IS_MAIN_WINDOW (win)) { - modest_ui_actions_on_main_window_move_to (action, - folder_view, - dst_folder, - MODEST_MAIN_WINDOW (win)); - } else { - modest_ui_actions_on_msg_view_window_move_to (action, - dst_folder, - MODEST_MSG_VIEW_WINDOW (win)); - } + /* Do window specific stuff */ + if (MODEST_IS_MAIN_WINDOW (win)) { + modest_ui_actions_on_main_window_move_to (action, + folder_view, + dst_folder, + MODEST_MAIN_WINDOW (win)); + } else { + modest_ui_actions_on_msg_view_window_move_to (action, + dst_folder, + MODEST_MSG_VIEW_WINDOW (win)); + } if (dst_folder) g_object_unref (dst_folder); @@ -4768,7 +5000,6 @@ retrieve_msg_contents_performer (gboolean canceled, TnyList *headers = TNY_LIST (user_data); if (err || canceled) { - /* Show an error ? */ goto out; } @@ -4811,7 +5042,7 @@ modest_ui_actions_on_retrieve_msg_contents (GtkAction *action, g_object_unref (iter); /* Connect and perform the message retrieval */ - modest_platform_connect_and_perform ((GtkWindow *) window, + modest_platform_connect_and_perform ((GtkWindow *) window, TRUE, g_object_ref (account), retrieve_msg_contents_performer, g_object_ref (headers)); @@ -4822,13 +5053,31 @@ modest_ui_actions_on_retrieve_msg_contents (GtkAction *action, } void +modest_ui_actions_check_toolbar_dimming_rules (ModestWindow *window) +{ + g_return_if_fail (MODEST_IS_WINDOW (window)); + + /* Update dimmed */ + modest_window_check_dimming_rules_group (window, MODEST_DIMMING_RULES_TOOLBAR); +} + +void +modest_ui_actions_check_menu_dimming_rules (ModestWindow *window) +{ + g_return_if_fail (MODEST_IS_WINDOW (window)); + + /* Update dimmed */ + modest_window_check_dimming_rules_group (window, MODEST_DIMMING_RULES_MENU); +} + +void modest_ui_actions_on_email_menu_activated (GtkAction *action, ModestWindow *window) { g_return_if_fail (MODEST_IS_WINDOW (window)); - /* Update dimmed */ - modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules"); + /* Update dimmed */ + modest_ui_actions_check_menu_dimming_rules (window); } void @@ -4837,8 +5086,8 @@ modest_ui_actions_on_edit_menu_activated (GtkAction *action, { g_return_if_fail (MODEST_IS_WINDOW (window)); - /* Update dimmed */ - modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules"); + /* Update dimmed */ + modest_ui_actions_check_menu_dimming_rules (window); } void @@ -4847,8 +5096,8 @@ modest_ui_actions_on_view_menu_activated (GtkAction *action, { g_return_if_fail (MODEST_IS_WINDOW (window)); - /* Update dimmed */ - modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules"); + /* Update dimmed */ + modest_ui_actions_check_menu_dimming_rules (window); } void @@ -4857,8 +5106,8 @@ modest_ui_actions_on_format_menu_activated (GtkAction *action, { g_return_if_fail (MODEST_IS_WINDOW (window)); - /* Update dimmed */ - modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules"); + /* Update dimmed */ + modest_ui_actions_check_menu_dimming_rules (window); } void @@ -4867,8 +5116,8 @@ modest_ui_actions_on_tools_menu_activated (GtkAction *action, { g_return_if_fail (MODEST_IS_WINDOW (window)); - /* Update dimmed */ - modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules"); + /* Update dimmed */ + modest_ui_actions_check_menu_dimming_rules (window); } void @@ -4877,8 +5126,8 @@ modest_ui_actions_on_attachment_menu_activated (GtkAction *action, { g_return_if_fail (MODEST_IS_WINDOW (window)); - /* Update dimmed */ - modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules"); + /* Update dimmed */ + modest_ui_actions_check_menu_dimming_rules (window); } void @@ -4887,8 +5136,8 @@ modest_ui_actions_on_toolbar_csm_menu_activated (GtkAction *action, { g_return_if_fail (MODEST_IS_WINDOW (window)); - /* Update dimmed */ - modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules"); + /* Update dimmed */ + modest_ui_actions_check_menu_dimming_rules (window); } void @@ -4897,8 +5146,8 @@ modest_ui_actions_on_folder_view_csm_menu_activated (GtkAction *action, { g_return_if_fail (MODEST_IS_WINDOW (window)); - /* Update dimmed */ - modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules"); + /* Update dimmed */ + modest_ui_actions_check_menu_dimming_rules (window); } void @@ -4907,17 +5156,8 @@ modest_ui_actions_on_header_view_csm_menu_activated (GtkAction *action, { g_return_if_fail (MODEST_IS_WINDOW (window)); - /* Update dimmed */ - modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules"); -} - -void -modest_ui_actions_check_toolbar_dimming_rules (ModestWindow *window) -{ - g_return_if_fail (MODEST_IS_WINDOW (window)); - - /* Update dimmed */ - modest_window_check_dimming_rules_group (window, "ModestToolbarDimmingRules"); + /* Update dimmed */ + modest_ui_actions_check_menu_dimming_rules (window); } void @@ -4978,6 +5218,7 @@ on_send_receive_finished (ModestMailOperation *mail_op, update_account does it always automatically */ if (folder_store && TNY_IS_FOLDER (folder_store) && tny_folder_get_folder_type (TNY_FOLDER (folder_store)) != TNY_FOLDER_TYPE_INBOX) { + ModestMailOperation *refresh_op; header_view = modest_main_window_get_child_widget (main_win, MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); @@ -4986,10 +5227,11 @@ on_send_receive_finished (ModestMailOperation *mail_op, because it hasn't changed. We also do not need to save the widget status. Just force a refresh */ - modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view), - TNY_FOLDER (folder_store), - folder_refreshed_cb, - main_win); + refresh_op = modest_mail_operation_new (G_OBJECT (main_win)); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), refresh_op); + modest_mail_operation_refresh_folder (refresh_op, TNY_FOLDER (folder_store), + folder_refreshed_cb, main_win); + g_object_unref (refresh_op); } if (folder_store) @@ -5009,7 +5251,7 @@ modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self, gchar *message = NULL; /* Don't show anything if the user cancelled something */ - if (err->code == TNY_TRANSPORT_ACCOUNT_ERROR_SEND_USER_CANCEL) + if (err->code == TNY_SYSTEM_ERROR_CANCEL) return; /* Get the server name: */ @@ -5026,20 +5268,20 @@ modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self, /* Show the appropriate message text for the GError: */ switch (err->code) { - case TNY_TRANSPORT_ACCOUNT_ERROR_SEND_HOST_LOOKUP_FAILED: + case TNY_SERVICE_ERROR_CONNECT: 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: + case TNY_SERVICE_ERROR_AUTHENTICATE: message = g_strdup_printf (_("emev_ni_ui_smtp_authentication_fail_error"), server_name); break; - case TNY_TRANSPORT_ACCOUNT_ERROR_SEND: + case TNY_SERVICE_ERROR_SEND: message = g_strdup (_("emev_ib_ui_smtp_send_error")); break; default: - g_return_if_reached (); + g_warning ("%s: unexpected ERROR %d", + __FUNCTION__, err->code); + message = g_strdup (_("emev_ib_ui_smtp_send_error")); + break; } /* TODO if the username or the password where not defined we