X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=307a6b95cc06640836eae749f3c8c8e7e343afbc;hp=976ea1fc9f89df84a4c5dabc8e153a134b76acfe;hb=f404ba79e8d272966fd48b2e30fa52b66290afe7;hpb=c7795718ea6b783cdcf7a641e8ce2dccea4b52d6 diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index 976ea1f..307a6b9 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -1,5 +1,5 @@ /* Copyright (c) 2006, Nokia Corporation - * All rights reserved. + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -45,6 +45,9 @@ #include "modest-tny-platform-factory.h" #include "modest-platform.h" #include +#include +#include +#include #ifdef MODEST_PLATFORM_MAEMO #include "maemo/modest-osso-state-saving.h" @@ -100,6 +103,11 @@ typedef struct _ReplyForwardHelper { GtkWidget *parent_window; } ReplyForwardHelper; +typedef struct _MoveToHelper { + ModestMailOperation *mail_op; + TnyFolder *folder; +} MoveToHelper; + typedef struct _PasteAsAttachmentHelper { ModestMsgEditWindow *window; GtkWidget *banner; @@ -136,27 +144,71 @@ static void _on_send_receive_progress_changed (ModestMailOperation *mail_op ModestMailOperationState *state, gpointer user_data); -static gboolean -download_uncached_messages (TnyList *header_list, GtkWindow *win, - gboolean reply_fwd); +static gint header_list_count_uncached_msgs (TnyList *header_list); +static gboolean connect_to_get_msg ( + GtkWindow *win, + gint num_of_uncached_msgs); -static void -run_account_setup_wizard (ModestWindow *win) + +/* 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) { - ModestEasysetupWizardDialog *wizard; + gboolean result = FALSE; + GtkDialog *wizard; - g_return_if_fail (MODEST_IS_WINDOW(win)); + 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 + */ + printf ("wizard already active\n"); + 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)); + } + - wizard = modest_easysetup_wizard_dialog_new (); - gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (win)); + /* 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 */ + if (!win) + win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr()); + + /* 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)); + /* 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); */ - gtk_dialog_run (GTK_DIALOG (wizard)); + gint dialog_response = gtk_dialog_run (GTK_DIALOG (wizard)); + if (dialog_response == GTK_RESPONSE_CANCEL) + result = FALSE; + else { + /* Check whether an account was created: */ + result = modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE); + } + gtk_widget_destroy (GTK_WIDGET (wizard)); + + /* clear it from the window mgr */ + modest_window_mgr_set_easysetup_dialog + (modest_runtime_get_window_mgr(), NULL); + + return result; } @@ -270,14 +322,32 @@ void modest_do_message_delete (TnyHeader *header, ModestWindow *win) g_object_unref (G_OBJECT (mail_op)); } -static void -headers_action_delete (TnyHeader *header, - ModestWindow *win, - gpointer user_data) +/** A convenience method, because deleting a message is + * otherwise complicated, and it's best to change it in one place + * when we change it. + */ +void modest_do_messages_delete (TnyList *headers, ModestWindow *win) { - modest_do_message_delete (header, win); + ModestMailOperation *mail_op = NULL; + mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_DELETE, + win ? G_OBJECT(win) : NULL); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), + mail_op); + + /* Always delete. TODO: Move to trash still not supported */ + modest_mail_operation_remove_msgs (mail_op, headers, FALSE); + g_object_unref (G_OBJECT (mail_op)); } +/* static void */ +/* headers_action_delete (TnyHeader *header, */ +/* ModestWindow *win, */ +/* gpointer user_data) */ +/* { */ +/* modest_do_message_delete (header, win); */ + +/* } */ + /** 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. **/ @@ -318,9 +388,11 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) return; } + /* Get the headers, either from the header view (if win is the main window), + * or from the message view window: */ header_list = get_selected_headers (win); if (!header_list) return; - + /* Check if any of the headers are already opened, or in the process of being opened */ if (MODEST_IS_MAIN_WINDOW (win)) { gboolean found; @@ -368,7 +440,6 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) tny_list_get_length(header_list)), desc); /* Confirmation dialog */ - printf("DEBUG: %s\n", __FUNCTION__); response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win), message); @@ -379,8 +450,11 @@ 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 */ if (MODEST_IS_MAIN_WINDOW (win)) { @@ -389,19 +463,27 @@ 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); } } } - /* Remove each header. If it's a view window header_view == NULL */ - do_headers_action (win, headers_action_delete, header_view); + /* Disable window dimming management */ + modest_window_disable_dimming (MODEST_WINDOW(win)); - /* refresh the header view (removing marked-as-deleted)*/ - modest_header_view_refilter (MODEST_HEADER_VIEW(header_view)); + /* Remove each header. If it's a view window header_view == NULL */ + modest_do_messages_delete (header_list, win); + + /* Enable window dimming management */ + gtk_tree_selection_unselect_all (sel); + modest_window_enable_dimming (MODEST_WINDOW(win)); if (MODEST_IS_MSG_VIEW_WINDOW (win)) { modest_ui_actions_refresh_message_window_after_delete (MODEST_MSG_VIEW_WINDOW (win)); @@ -414,16 +496,31 @@ 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) { + printf ("DEBUG: %s: Error: code=%d, text=%s\n", __FUNCTION__, err->code, err->message); + g_error_free(err); + } + /* Update toolbar dimming state */ modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window)); @@ -464,7 +561,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 */ @@ -479,11 +578,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 @@ -530,7 +634,7 @@ modest_ui_actions_on_accounts (GtkAction *action, ModestWindow *win) /* This is currently only implemented for Maemo */ #ifdef MODEST_PLATFORM_MAEMO /* Defined in config.h */ if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE)) { - run_account_setup_wizard (win); + modest_run_account_setup_wizard (win); return; } else { /* Show the list of accounts: */ @@ -572,12 +676,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)); } @@ -593,22 +694,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)); @@ -636,13 +725,14 @@ modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win) /* if there are no accounts yet, just show the wizard */ if (!modest_account_mgr_has_accounts (modest_runtime_get_account_mgr(), TRUE)) { - run_account_setup_wizard (win); - return; + const gboolean created = modest_run_account_setup_wizard (win); + if (!created) + return; } - account_name = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr ()); + account_name = g_strdup (modest_window_get_active_account (win)); if (!account_name) - account_name = g_strdup (modest_window_get_active_account (win)); + account_name = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr ()); if (!account_name) { g_printerr ("modest: no account found\n"); goto cleanup; @@ -662,16 +752,17 @@ modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win) goto cleanup; } - if (modest_account_mgr_get_bool (modest_runtime_get_account_mgr (), account_name, - MODEST_ACCOUNT_USE_SIGNATURE, FALSE)) { - signature = modest_account_mgr_get_string (modest_runtime_get_account_mgr (), account_name, - MODEST_ACCOUNT_SIGNATURE, FALSE); + gboolean use_signature = FALSE; + signature = modest_account_mgr_get_signature (modest_runtime_get_account_mgr (), account_name, &use_signature); + + if (use_signature) { blank_and_signature = g_strconcat ("\n", signature, NULL); - g_free (signature); } else { blank_and_signature = g_strdup (""); } + g_free (signature); + msg = modest_tny_msg_new ("", from_str, "", "", "", blank_and_signature, NULL); if (!msg) { g_printerr ("modest: failed to create new msg\n"); @@ -684,16 +775,16 @@ modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win) goto cleanup; } - + /* Create and register edit window */ - /* This is destroyed by TOOD. */ + /* This is destroyed by TODO. */ msg_win = modest_msg_edit_window_new (msg, account_name, FALSE); mgr = modest_runtime_get_window_mgr (); modest_window_mgr_register_window (mgr, msg_win); 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: @@ -732,10 +823,7 @@ modest_ui_actions_msg_retrieval_check (ModestMailOperation *mail_op, } static void -open_msg_cb (ModestMailOperation *mail_op, - TnyHeader *header, - TnyMsg *msg, - gpointer user_data) +open_msg_cb (ModestMailOperation *mail_op, TnyHeader *header, TnyMsg *msg, gpointer user_data) { ModestWindowMgr *mgr = NULL; ModestWindow *parent_win = NULL; @@ -747,9 +835,8 @@ open_msg_cb (ModestMailOperation *mail_op, /* Do nothing if there was any problem with the mail operation. The error will be shown by the error_handler of the mail operation */ - if (!modest_ui_actions_msg_retrieval_check (mail_op, header, msg)) { + if (!modest_ui_actions_msg_retrieval_check (mail_op, header, msg)) return; - } parent_win = (ModestWindow *) modest_mail_operation_get_source (mail_op); folder = tny_header_get_folder (header); @@ -772,11 +859,16 @@ open_msg_cb (ModestMailOperation *mail_op, (folder_type == TNY_FOLDER_TYPE_OUTBOX)) { /* we cannot edit without a valid account... */ if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE)) { - run_account_setup_wizard(parent_win); - goto cleanup; + const gboolean created = modest_run_account_setup_wizard(parent_win); + if (!created) + goto cleanup; } win = modest_msg_edit_window_new (msg, account, 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); @@ -799,17 +891,15 @@ open_msg_cb (ModestMailOperation *mail_op, g_list_foreach (sel_list, (GFunc) gtk_tree_path_free, NULL); g_list_free (sel_list); - win = modest_msg_view_window_new_with_header_model (msg, - account, - (const gchar*) uid, - model, - row_reference); + win = modest_msg_view_window_new_with_header_model ( + msg, account, (const gchar*) uid, + model, row_reference); gtk_tree_row_reference_free (row_reference); } else { - win = modest_msg_view_window_new (msg, account, (const gchar*) uid); + win = modest_msg_view_window_new_for_attachment (msg, account, (const gchar*) uid); } } else { - win = modest_msg_view_window_new (msg, account, (const gchar*) uid); + win = modest_msg_view_window_new_for_attachment (msg, account, (const gchar*) uid); } g_free (uid); } @@ -872,13 +962,23 @@ _modest_ui_actions_open (TnyList *headers, ModestWindow *win) TnyList *not_opened_headers = NULL; TnyHeaderFlags flags = 0; + g_return_if_fail (headers != NULL); + + /* Check that only one message is selected for opening */ + if (tny_list_get_length (headers) != 1) { + modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL, + _("mcen_ib_select_one_message")); + return; + } + + /* 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; @@ -1009,9 +1109,7 @@ free_reply_forward_helper (gpointer data) } static void -reply_forward_cb (ModestMailOperation *mail_op, - TnyHeader *header, - TnyMsg *msg, +reply_forward_cb (ModestMailOperation *mail_op, TnyHeader *header, TnyMsg *msg, gpointer user_data) { TnyMsg *new_msg; @@ -1107,22 +1205,13 @@ cleanup: free_reply_forward_helper (rf_helper); } -/* - * Checks a list of headers. If any of them are not currently - * downloaded (CACHED) then it asks the user for permission to - * download them. - * - * Returns FALSE if the user does not want to download the - * messages. Returns TRUE if the user allowed the download or if all - * of them are currently downloaded +/* Checks a list of headers. If any of them are not currently + * downloaded (CACHED) then returns TRUE else returns FALSE. */ -static gboolean -download_uncached_messages (TnyList *header_list, - GtkWindow *win, - gboolean reply_fwd) +static gint +header_list_count_uncached_msgs (TnyList *header_list) { TnyIterator *iter; - gboolean retval; gint uncached_messages = 0; iter = tny_list_create_iterator (header_list); @@ -1140,29 +1229,31 @@ download_uncached_messages (TnyList *header_list, } g_object_unref (iter); - /* Ask for user permission to download the messages */ - retval = TRUE; - if (uncached_messages > 0) { - GtkResponseType response; - if (reply_fwd) - response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win), - _("emev_nc_include_original")); - else - response = - modest_platform_run_confirmation_dialog (GTK_WINDOW (win), - ngettext("mcen_nc_get_msg", - "mcen_nc_get_msgs", - uncached_messages)); - if (response == GTK_RESPONSE_CANCEL) - retval = FALSE; - else { - /* If a download will be necessary, make sure that we have a connection: */ - retval = modest_platform_connect_and_wait(win, NULL); - } - } - return retval; + return uncached_messages; } +/* Returns FALSE if the user does not want to download the + * messages. Returns TRUE if the user allowed the download. + */ +static gboolean +connect_to_get_msg (GtkWindow *win, + gint num_of_uncached_msgs) +{ + /* 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); +} /* * Common code for the reply and forward actions @@ -1181,8 +1272,9 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) /* we need an account when editing */ if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE)) { - run_account_setup_wizard (win); - return; + const gboolean created = modest_run_account_setup_wizard (win); + if (!created) + return; } header_list = get_selected_headers (win); @@ -1194,10 +1286,22 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) (action == ACTION_FORWARD) ? MODEST_CONF_FORWARD_TYPE : MODEST_CONF_REPLY_TYPE, NULL); - /* Check that the messages have been previously downloaded */ - do_retrieve = (action == ACTION_FORWARD) || (reply_forward_type != MODEST_TNY_MSG_REPLY_TYPE_CITE); - if (do_retrieve) - continue_download = download_uncached_messages (header_list, GTK_WINDOW (win), TRUE); + /* check if we need to download msg before asking about it */ + do_retrieve = (action == ACTION_FORWARD) || + (reply_forward_type != MODEST_TNY_MSG_REPLY_TYPE_CITE); + + 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); + /* 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 (!continue_download) { g_object_unref (header_list); return; @@ -1310,14 +1414,17 @@ modest_ui_actions_on_next (GtkAction *action, if (MODEST_IS_MAIN_WINDOW (window)) { GtkWidget *header_view; - header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(window), - MODEST_WIDGET_TYPE_HEADER_VIEW); + header_view = modest_main_window_get_child_widget ( + MODEST_MAIN_WINDOW(window), + MODEST_WIDGET_TYPE_HEADER_VIEW); if (!header_view) return; - modest_header_view_select_next (MODEST_HEADER_VIEW(header_view)); + modest_header_view_select_next ( + MODEST_HEADER_VIEW(header_view)); } else if (MODEST_IS_MSG_VIEW_WINDOW (window)) { - modest_msg_view_window_select_next_message (MODEST_MSG_VIEW_WINDOW (window)); + modest_msg_view_window_select_next_message ( + MODEST_MSG_VIEW_WINDOW (window)); } else { g_return_if_reached (); } @@ -1370,10 +1477,31 @@ new_messages_arrived (ModestMailOperation *self, gint new_messages, gpointer user_data) { - if (new_messages == 0) - return; + ModestMainWindow *win = NULL; + GtkWidget *folder_view = NULL; + TnyFolderStore *folder = NULL; + gboolean folder_empty = FALSE; + + g_return_if_fail (MODEST_IS_MAIN_WINDOW (user_data)); + win = MODEST_MAIN_WINDOW (user_data); + + /* Set contents style of headers view */ + if (modest_main_window_get_contents_style (win) == MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY) { + folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), + MODEST_WIDGET_TYPE_FOLDER_VIEW); + folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view)); + + + folder_empty = (tny_folder_get_all_count (TNY_FOLDER (folder)) == 0); + + if (!folder_empty) + modest_main_window_set_contents_style (win, + MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS); + } - modest_platform_on_new_msg (); + /* Notify new messages have been downloaded */ + if (new_messages > 0) + modest_platform_on_new_msg (); } /* @@ -1422,7 +1550,7 @@ modest_ui_actions_do_send_receive (const gchar *account_name, ModestWindow *win) internally, so the progress objects will receive the proper progress information */ modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); - modest_mail_operation_update_account (mail_op, acc_name, new_messages_arrived, NULL); + modest_mail_operation_update_account (mail_op, acc_name, new_messages_arrived, win); g_object_unref (G_OBJECT (mail_op)); /* Free */ @@ -1536,6 +1664,8 @@ modest_do_refresh_current_folder(ModestWindow *win) folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), MODEST_WIDGET_TYPE_FOLDER_VIEW); + if (!folder_view) + return; folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); @@ -1644,15 +1774,6 @@ modest_ui_actions_on_header_selected (ModestHeaderView *header_view, if (!gtk_widget_is_focus (GTK_WIDGET(header_view))) gtk_widget_grab_focus (GTK_WIDGET(header_view)); - /* Update Main window title */ - if (gtk_widget_is_focus (GTK_WIDGET(header_view))) { - const gchar *subject = tny_header_get_subject (header); - if (subject && strlen(subject) > 0) - gtk_window_set_title (GTK_WINDOW (main_window), subject); - else - gtk_window_set_title (GTK_WINDOW (main_window), _("mail_va_no_subject")); - } - /* Update toolbar dimming state */ modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window)); } @@ -1669,8 +1790,10 @@ modest_ui_actions_on_header_activated (ModestHeaderView *header_view, if (!header) return; - headers = tny_simple_list_new (); - tny_list_prepend (headers, G_OBJECT (header)); + +/* headers = tny_simple_list_new (); */ +/* tny_list_prepend (headers, G_OBJECT (header)); */ + headers = modest_header_view_get_selected_headers (header_view); _modest_ui_actions_open (headers, MODEST_WINDOW (main_window)); @@ -1690,10 +1813,20 @@ set_active_account_from_tny_account (TnyAccount *account, modest_tny_account_store_get_tny_account_by (modest_runtime_get_account_store (), MODEST_TNY_ACCOUNT_STORE_QUERY_ID, server_acc_name); + if (!modest_server_account) { + g_warning ("%s: could not get tny account\n", __FUNCTION__); + return; + } + + /* Update active account, but only if it's not a pseudo-account */ + if ((!modest_tny_account_is_virtual_local_folders(modest_server_account)) && + (!modest_tny_account_is_memory_card_account(modest_server_account))) { + const gchar *modest_acc_name = + modest_tny_account_get_parent_modest_account_name_for_server_account (modest_server_account); + if (modest_acc_name) + modest_window_set_active_account (window, modest_acc_name); + } - const gchar *modest_acc_name = - modest_tny_account_get_parent_modest_account_name_for_server_account (modest_server_account); - modest_window_set_active_account (window, modest_acc_name); g_object_unref (modest_server_account); } @@ -1705,7 +1838,8 @@ 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; g_return_if_fail (TNY_IS_FOLDER (folder)); @@ -1714,20 +1848,22 @@ folder_refreshed_cb (ModestMailOperation *mail_op, modest_main_window_get_child_widget(win, MODEST_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 */ - if (tny_folder_get_all_count (folder) == 0) { - printf ("DEBUG: %s: tny_folder_get_all_count() returned 0.\n", __FUNCTION__); + 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) modest_main_window_set_contents_style (win, MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY); - } else { - printf ("DEBUG: %s: tny_folder_get_all_count() returned >0.\n", __FUNCTION__); - } } void @@ -1750,8 +1886,8 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view, if (TNY_IS_ACCOUNT (folder_store)) { if (selected) { - /* Update active account */ set_active_account_from_tny_account (TNY_ACCOUNT (folder_store), MODEST_WINDOW (main_window)); + /* Show account details */ modest_main_window_set_contents_style (main_window, MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS); } @@ -1791,7 +1927,7 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view, MODEST_CONF_HEADER_VIEW_KEY); } else { /* Update the active account */ - modest_window_set_active_account (MODEST_WINDOW (main_window), NULL); + //modest_window_set_active_account (MODEST_WINDOW (main_window), NULL); /* Save only if we're seeing headers */ if (modest_main_window_get_contents_style (main_window) == MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS) @@ -1822,17 +1958,18 @@ modest_ui_actions_on_item_not_found (ModestHeaderView *header_view,ModestItemTyp dialog = gtk_message_dialog_new (GTK_WINDOW (win), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, - GTK_BUTTONS_OK, + GTK_BUTTONS_NONE, _("The %s you selected cannot be found"), item); + gtk_dialog_add_button (GTK_DIALOG (dialog),_("mcen_bd_dialog_ok"), GTK_RESPONSE_ACCEPT); gtk_dialog_run (GTK_DIALOG(dialog)); } else { dialog = gtk_dialog_new_with_buttons (_("Connection requested"), GTK_WINDOW (win), GTK_DIALOG_MODAL, - GTK_STOCK_CANCEL, + _("mcen_bd_dialog_cancel"), GTK_RESPONSE_REJECT, - GTK_STOCK_OK, + _("mcen_bd_dialog_ok"), GTK_RESPONSE_ACCEPT, NULL); txt = g_strdup_printf (_("This %s is not available in offline mode.\n" @@ -1982,8 +2119,9 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) if (!account_name) { /* Run account setup wizard */ - run_account_setup_wizard(MODEST_WINDOW(edit_window)); - return; + const gboolean created = modest_run_account_setup_wizard(MODEST_WINDOW(edit_window)); + if (!created) + return; } MsgData *data = modest_msg_edit_window_get_msg_data (edit_window); @@ -1999,41 +2137,13 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) account_name)); if (!transport_account) { /* Run account setup wizard */ - run_account_setup_wizard(MODEST_WINDOW(edit_window)); - return; + const gboolean created = modest_run_account_setup_wizard(MODEST_WINDOW(edit_window)); + if (!created) + return; } gchar *from = modest_account_mgr_get_from_string (account_mgr, account_name); - /* mail content checks and dialogs */ - if (data->subject == NULL || data->subject[0] == '\0') { - GtkResponseType response; - response = modest_platform_run_confirmation_dialog (GTK_WINDOW (edit_window), - _("mcen_nc_subject_is_empty_send")); - if (response == GTK_RESPONSE_CANCEL) { - g_free (account_name); - return; - } - } - - if (data->plain_body == NULL || data->plain_body[0] == '\0') { - GtkResponseType response; - gchar *note_message; - gchar *note_subject = data->subject; - if (note_subject == NULL || note_subject[0] == '\0') - note_subject = _("mail_va_no_subject"); - note_message = g_strdup_printf (_("emev_ni_ui_smtp_message_null"), note_subject); - response = modest_platform_run_confirmation_dialog (GTK_WINDOW (edit_window), - note_message); - g_free (note_message); - if (response == GTK_RESPONSE_CANCEL) { - g_free (account_name); - return; - } - } - - modest_platform_information_banner (NULL, NULL, _("mcen_ib_outbox_waiting_to_be_sent")); - /* Create the mail operation */ ModestMailOperation *mail_operation = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_SEND, G_OBJECT(edit_window)); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_operation); @@ -2235,6 +2345,21 @@ modest_ui_actions_create_folder(GtkWidget *parent_window, gboolean finished = FALSE; gint result; gchar *folder_name = NULL, *suggested_name = NULL; + const gchar *proto_str = NULL; + TnyAccount *account; + + if (TNY_IS_ACCOUNT (parent_folder)) + account = g_object_ref (parent_folder); + else + account = tny_folder_get_account (TNY_FOLDER (parent_folder)); + proto_str = tny_account_get_proto (TNY_ACCOUNT (account)); + + if (proto_str && modest_protocol_info_get_transport_store_protocol (proto_str) == + MODEST_PROTOCOL_STORE_POP) { + finished = TRUE; + hildon_banner_show_information (NULL, NULL, _("mail_in_ui_folder_create_error")); + } + g_object_unref (account); /* Run the new folder dialog */ while (!finished) { @@ -2299,21 +2424,24 @@ static void modest_ui_actions_rename_folder_error_handler (ModestMailOperation *mail_op, gpointer user_data) { - GObject *win = modest_mail_operation_get_source (mail_op); + ModestMainWindow *window = MODEST_MAIN_WINDOW (user_data); const GError *error = NULL; const gchar *message = NULL; /* Get error message */ error = modest_mail_operation_get_error (mail_op); - if (error != NULL && error->message != NULL) { - message = error->message; - } else { - message = _("!!! FIXME: Unable to rename"); + if (!error) + g_return_if_reached (); + + switch (error->code) { + case MODEST_MAIL_OPERATION_ERROR_FOLDER_EXISTS: + message = _CS("ckdg_ib_folder_already_exists"); + break; + default: + g_return_if_reached (); } - - /* Show notification dialog */ - modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL, message); - g_object_unref (win); + + modest_platform_information_banner (GTK_WIDGET (window), NULL, message); } void @@ -2338,46 +2466,55 @@ modest_ui_actions_on_rename_folder (GtkAction *action, return; folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view)); - if (!folder) - return; - /* Offer the connection dialog if necessary: */ - if (!modest_platform_connect_and_wait_if_network_folderstore (NULL, folder)) { - g_object_unref (G_OBJECT (folder)); + if (!folder) return; - } - if (TNY_IS_FOLDER (folder)) { gchar *folder_name; gint response; const gchar *current_name; + TnyFolderStore *parent; + gboolean do_rename = TRUE; current_name = tny_folder_get_name (TNY_FOLDER (folder)); - response = modest_platform_run_rename_folder_dialog (GTK_WINDOW (main_window), NULL, - current_name, &folder_name); - - if (response == GTK_RESPONSE_ACCEPT && strlen (folder_name) > 0) { + parent = tny_folder_get_folder_store (TNY_FOLDER (folder)); + response = modest_platform_run_rename_folder_dialog (GTK_WINDOW (main_window), + parent, current_name, + &folder_name); + g_object_unref (parent); + + if (response != GTK_RESPONSE_ACCEPT || strlen (folder_name) == 0) { + do_rename = FALSE; + } else if (modest_platform_is_network_folderstore(folder) && + !tny_device_is_online (modest_runtime_get_device())) { + TnyAccount *account = tny_folder_get_account(TNY_FOLDER(folder)); + do_rename = modest_platform_connect_and_wait(GTK_WINDOW(main_window), account); + g_object_unref(account); + } + + if (do_rename) { ModestMailOperation *mail_op; + GtkTreeSelection *sel = NULL; mail_op = - modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_INFO, + modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_INFO, G_OBJECT(main_window), modest_ui_actions_rename_folder_error_handler, - NULL); - + main_window); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); - modest_header_view_clear (MODEST_HEADER_VIEW (header_view)); - + /* Clear the headers view */ + 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(folder), TRUE); - - modest_header_view_clear ((ModestHeaderView *) header_view); - + /* Actually rename the folder */ modest_mail_operation_rename_folder (mail_op, TNY_FOLDER (folder), (const gchar *) folder_name); @@ -2407,7 +2544,8 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) GtkWidget *folder_view; gint response; gchar *message; - + gboolean do_delete = TRUE; + g_return_if_fail (MODEST_IS_MAIN_WINDOW (main_window)); folder_view = modest_main_window_get_child_widget (main_window, @@ -2425,12 +2563,6 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) return ; } - /* Offer the connection dialog if necessary: */ - if (!modest_platform_connect_and_wait_if_network_folderstore (NULL, folder)) { - g_object_unref (G_OBJECT (folder)); - return; - } - /* Ask the user */ message = g_strdup_printf (_("mcen_nc_delete_folder_text"), tny_folder_get_name (TNY_FOLDER (folder))); @@ -2438,8 +2570,25 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) (const gchar *) message); g_free (message); - if (response == GTK_RESPONSE_OK) { - ModestMailOperation *mail_op = + if (response != GTK_RESPONSE_OK) { + do_delete = FALSE; + } else if (modest_platform_is_network_folderstore(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 (MODEST_MAIL_OPERATION_TYPE_DELETE, G_OBJECT(main_window), modest_ui_actions_delete_folder_error_handler, @@ -2458,9 +2607,15 @@ void modest_ui_actions_on_delete_folder (GtkAction *action, ModestMainWindow *main_window) { + GtkWidget *folder_view; g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window)); delete_folder (main_window, FALSE); + folder_view = modest_main_window_get_child_widget (main_window, + MODEST_WIDGET_TYPE_FOLDER_VIEW); + if (!folder_view) + return; + modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (folder_view)); } void @@ -2518,9 +2673,9 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store, GtkWidget *dialog = gtk_dialog_new_with_buttons (_("mail_ti_password_protected"), NULL, GTK_DIALOG_MODAL, - GTK_STOCK_OK, + _("mcen_bd_dialog_ok"), GTK_RESPONSE_ACCEPT, - GTK_STOCK_CANCEL, + _("mcen_bd_dialog_cancel"), GTK_RESPONSE_REJECT, NULL); #else @@ -2694,7 +2849,26 @@ modest_ui_actions_on_cut (GtkAction *action, gtk_clipboard_set_can_store (clipboard, NULL, 0); gtk_clipboard_store (clipboard); } else if (MODEST_IS_HEADER_VIEW (focused_widget)) { - modest_header_view_cut_selection (MODEST_HEADER_VIEW (focused_widget)); + TnyList *header_list = modest_header_view_get_selected_headers ( + MODEST_HEADER_VIEW (focused_widget)); + gboolean continue_download = FALSE; + gint num_of_unc_msgs; + + 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 == 0 || continue_download) { +/* modest_platform_information_banner ( + NULL, NULL, _CS("mcen_ib_getting_items"));*/ + modest_header_view_cut_selection ( + MODEST_HEADER_VIEW (focused_widget)); + } + + g_object_unref (header_list); } else if (MODEST_IS_FOLDER_VIEW (focused_widget)) { modest_folder_view_cut_selection (MODEST_FOLDER_VIEW (focused_widget)); } @@ -2706,6 +2880,7 @@ modest_ui_actions_on_copy (GtkAction *action, { GtkClipboard *clipboard; GtkWidget *focused_widget; + gboolean copied = TRUE; clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); focused_widget = gtk_window_get_focus (GTK_WINDOW (window)); @@ -2729,39 +2904,36 @@ modest_ui_actions_on_copy (GtkAction *action, gtk_clipboard_set_can_store (clipboard, NULL, 0); gtk_clipboard_store (clipboard); } else if (MODEST_IS_HEADER_VIEW (focused_widget)) { - TnyList *header_list = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (focused_widget)); - TnyIterator *iter = tny_list_create_iterator (header_list); - TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter)); - - gboolean ask = FALSE; - if (header) { - TnyFolder *folder = tny_header_get_folder (header); - TnyAccount *account = tny_folder_get_account (folder); - const gchar *proto_str = tny_account_get_proto (TNY_ACCOUNT (account)); - /* If it's POP then ask */ - ask = (modest_protocol_info_get_transport_store_protocol (proto_str) == - MODEST_PROTOCOL_STORE_POP) ? TRUE : FALSE; - g_object_unref (account); - g_object_unref (folder); - g_object_unref (header); - } + TnyList *header_list = modest_header_view_get_selected_headers ( + MODEST_HEADER_VIEW (focused_widget)); + gboolean continue_download = FALSE; + gint num_of_unc_msgs; + + 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 == 0 || continue_download) { + modest_platform_information_banner ( + NULL, NULL, _CS("mcen_ib_getting_items")); + modest_header_view_copy_selection ( + MODEST_HEADER_VIEW (focused_widget)); + } else + copied = FALSE; - g_object_unref (iter); - - /* Check that the messages have been previously downloaded */ - gboolean continue_download = TRUE; - if (ask) - continue_download = download_uncached_messages (header_list, GTK_WINDOW (window), FALSE); - if (continue_download) - modest_header_view_copy_selection (MODEST_HEADER_VIEW (focused_widget)); g_object_unref (header_list); + } else if (MODEST_IS_FOLDER_VIEW (focused_widget)) { modest_folder_view_copy_selection (MODEST_FOLDER_VIEW (focused_widget)); - } + } - /* Show information banner */ - modest_platform_information_banner (NULL, NULL, _CS("ecoc_ib_edwin_copied")); - + /* Show information banner if there was a copy to clipboard */ + if(copied) + modest_platform_information_banner ( + NULL, NULL, _CS("ecoc_ib_edwin_copied")); } void @@ -2805,6 +2977,7 @@ paste_msgs_cb (const GObject *object, gpointer user_data) gtk_widget_destroy (GTK_WIDGET(user_data)); } + static void paste_as_attachment_free (gpointer data) { @@ -2895,30 +3068,50 @@ modest_ui_actions_on_paste (GtkAction *action, /* Create a new mail operation */ mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(window)); - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), - mail_op); /* Get destination folder */ folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (focused_widget)); - /* Launch notification */ - inf_note = modest_platform_animation_banner (GTK_WIDGET (window), NULL, - _CS("ckct_nw_pasting")); - if (inf_note != NULL) { - gtk_window_set_modal (GTK_WINDOW(inf_note), FALSE); - gtk_widget_show (GTK_WIDGET(inf_note)); - } - /* transfer messages */ if (data != NULL) { - modest_mail_operation_xfer_msgs (mail_op, - data, - TNY_FOLDER (folder_store), - delete, - paste_msgs_cb, - inf_note); + gint response = 0; + + /* Ask for user confirmation */ + response = msgs_move_to_confirmation (GTK_WINDOW (window), + TNY_FOLDER (folder_store), + delete, + data); + + if (response == GTK_RESPONSE_OK) { + /* Launch notification */ + inf_note = modest_platform_animation_banner (GTK_WIDGET (window), NULL, + _CS("ckct_nw_pasting")); + if (inf_note != NULL) { + gtk_window_set_modal (GTK_WINDOW(inf_note), FALSE); + gtk_widget_show (GTK_WIDGET(inf_note)); + } + + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); + modest_mail_operation_xfer_msgs (mail_op, + data, + TNY_FOLDER (folder_store), + delete, + paste_msgs_cb, + inf_note); + } else { + g_object_unref (mail_op); + } } else if (src_folder != NULL) { + /* Launch notification */ + inf_note = modest_platform_animation_banner (GTK_WIDGET (window), NULL, + _CS("ckct_nw_pasting")); + if (inf_note != NULL) { + gtk_window_set_modal (GTK_WINDOW(inf_note), FALSE); + gtk_widget_show (GTK_WIDGET(inf_note)); + } + + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); modest_mail_operation_xfer_folder (mail_op, src_folder, folder_store, @@ -2965,16 +3158,25 @@ modest_ui_actions_on_select_all (GtkAction *action, GtkWidget *header_view = focused_widget; GtkTreeSelection *selection = NULL; - if (!(MODEST_IS_HEADER_VIEW (focused_widget))) + if (!(MODEST_IS_HEADER_VIEW (focused_widget))) { header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (window), MODEST_WIDGET_TYPE_HEADER_VIEW); + } + /* Disable window dimming management */ + modest_window_disable_dimming (MODEST_WINDOW(window)); + /* Select all messages */ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(header_view)); gtk_tree_selection_select_all (selection); /* Set focuse on header view */ gtk_widget_grab_focus (header_view); + + + /* Enable window dimming management */ + modest_window_enable_dimming (MODEST_WINDOW(window)); + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window)); } } @@ -3012,9 +3214,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)); @@ -3023,9 +3226,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; @@ -3244,7 +3448,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 @@ -3292,6 +3496,133 @@ create_move_to_dialog_on_new_folder(GtkWidget *button, gpointer user_data) GTK_WIDGET (user_data)); } +/* + * This function is used to track changes in the selection of the + * folder view that is inside the "move to" dialog to enable/disable + * the OK button because we do not want the user to select a disallowed + * destination for a folder. + * The user also not desired to be able to use NEW button on items where + * folder creation is not possibel. + */ +static void +on_move_to_dialog_folder_selection_changed (ModestFolderView* self, + TnyFolderStore *folder_store, + gboolean selected, + gpointer user_data) +{ + GtkWidget *dialog = NULL; + GtkWidget *ok_button = NULL, *new_button = NULL; + GList *children = NULL; + gboolean ok_sensitive = TRUE, new_sensitive = TRUE; + gboolean moving_folder = FALSE; + gboolean is_local_account = TRUE; + GtkWidget *folder_view = NULL; + ModestTnyFolderRules rules; + + if (!selected) + return; + + /* Get the OK button */ + dialog = gtk_widget_get_ancestor (GTK_WIDGET (self), GTK_TYPE_DIALOG); + if (!dialog) + return; + + children = gtk_container_get_children (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area)); + ok_button = GTK_WIDGET (children->next->next->data); + new_button = GTK_WIDGET (children->next->data); + g_list_free (children); + + /* check if folder_store is an remote account */ + if (TNY_IS_ACCOUNT (folder_store)) { + TnyAccount *local_account = NULL; + ModestTnyAccountStore *account_store = NULL; + + account_store = modest_runtime_get_account_store (); + local_account = modest_tny_account_store_get_local_folders_account (account_store); + + if ((gpointer) local_account != (gpointer) folder_store) { + is_local_account = FALSE; + /* New button should be dimmed on remote + account root */ + new_sensitive = FALSE; + } + g_object_unref (local_account); + } + + /* Check the target folder rules */ + if (TNY_IS_FOLDER (folder_store)) { + rules = modest_tny_folder_get_rules (TNY_FOLDER (folder_store)); + if (rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE) { + ok_sensitive = FALSE; + new_sensitive = FALSE; + goto end; + } + } + + /* Check if we're moving a folder */ + 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); + if (gtk_widget_is_focus (folder_view)) + moving_folder = TRUE; + } + + if (moving_folder) { + TnyFolderStore *moved_folder = NULL, *parent = NULL; + + /* Get the folder to move */ + moved_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); + + /* Check that we're not moving to the same folder */ + if (TNY_IS_FOLDER (moved_folder)) { + parent = tny_folder_get_folder_store (TNY_FOLDER (moved_folder)); + if (parent == folder_store) + ok_sensitive = FALSE; + g_object_unref (parent); + } + + if (ok_sensitive && TNY_IS_ACCOUNT (folder_store)) { + /* Do not allow to move to an account unless it's the + local folders account */ + if (!is_local_account) + ok_sensitive = FALSE; + } + + if (ok_sensitive && (moved_folder == folder_store)) { + /* Do not allow to move to itself */ + ok_sensitive = FALSE; + } + g_object_unref (moved_folder); + } else { + TnyHeader *header = NULL; + TnyFolder *src_folder = NULL; + + /* Moving a message */ + if (MODEST_IS_MSG_VIEW_WINDOW (user_data)) { + header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (user_data)); + src_folder = tny_header_get_folder (header); + g_object_unref (header); + } else { + src_folder = + TNY_FOLDER (modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view))); + } + + /* Do not allow to move the msg to the same folder */ + /* Do not allow to move the msg to an account */ + if ((gpointer) src_folder == (gpointer) folder_store || + TNY_IS_ACCOUNT (folder_store)) + ok_sensitive = FALSE; + g_object_unref (src_folder); + } + + end: + /* Set sensitivity of the OK button */ + gtk_widget_set_sensitive (ok_button, ok_sensitive); + /* Set sensitivity of the NEW button */ + gtk_widget_set_sensitive (new_button, new_sensitive); +} + static GtkWidget* create_move_to_dialog (GtkWindow *win, GtkWidget *folder_view, @@ -3305,12 +3636,12 @@ create_move_to_dialog (GtkWindow *win, GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR | GTK_DIALOG_DESTROY_WITH_PARENT, NULL); - gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_OK, GTK_RESPONSE_ACCEPT); + gtk_dialog_add_button (GTK_DIALOG (dialog), _("mcen_bd_dialog_ok"), GTK_RESPONSE_ACCEPT); /* We do this manually so GTK+ does not associate a response ID for * the button. */ - new_button = gtk_button_new_from_stock (GTK_STOCK_NEW); + new_button = gtk_button_new_from_stock (_("mcen_bd_new")); gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->action_area), new_button, FALSE, FALSE, 0); - gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT); + gtk_dialog_add_button (GTK_DIALOG (dialog), _("mcen_bd_dialog_cancel"), GTK_RESPONSE_REJECT); /* Create scrolled window */ scroll = gtk_scrolled_window_new (NULL, NULL); @@ -3321,19 +3652,57 @@ create_move_to_dialog (GtkWindow *win, /* Create folder view */ *tree_view = modest_platform_create_folder_view (NULL); - g_signal_connect (G_OBJECT (new_button), "clicked", G_CALLBACK(create_move_to_dialog_on_new_folder), *tree_view); + /* Track changes in the selection to + * disable the OK button whenever "Move to" is not possible + * disbale NEW button whenever New is not possible */ + g_signal_connect (*tree_view, + "folder_selection_changed", + G_CALLBACK (on_move_to_dialog_folder_selection_changed), + win); + + /* Listen to clicks on New button */ + g_signal_connect (G_OBJECT (new_button), + "clicked", + G_CALLBACK(create_move_to_dialog_on_new_folder), + *tree_view); /* It could happen that we're trying to move a message from a window (msg window for example) after the main window was closed, so we can not just get the model of the folder view */ - if (MODEST_IS_FOLDER_VIEW (folder_view)) - gtk_tree_view_set_model (GTK_TREE_VIEW (*tree_view), - gtk_tree_view_get_model (GTK_TREE_VIEW (folder_view))); - else + if (MODEST_IS_FOLDER_VIEW (folder_view)) { + const gchar *visible_id = NULL; + + modest_folder_view_copy_model (MODEST_FOLDER_VIEW(folder_view), + MODEST_FOLDER_VIEW(*tree_view)); + + visible_id = + modest_folder_view_get_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(folder_view)); + + /* Show the same account than the one that is shown in the main window */ + modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(*tree_view), + visible_id); + } else { + const gchar *active_account_name = NULL; + ModestAccountMgr *mgr = NULL; + ModestAccountData *acc_data = NULL; + modest_folder_view_update_model (MODEST_FOLDER_VIEW (*tree_view), TNY_ACCOUNT_STORE (modest_runtime_get_account_store ())); + active_account_name = modest_window_get_active_account (MODEST_WINDOW (win)); + mgr = modest_runtime_get_account_mgr (); + acc_data = modest_account_mgr_get_account_data (mgr, active_account_name); + + /* Set the new visible & active account */ + if (acc_data && acc_data->store_account) { + modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW (*tree_view), + acc_data->store_account->account_name); + modest_account_mgr_free_account_data (mgr, acc_data); + } + } + + /* Hide special folders */ modest_folder_view_show_non_move_folders (MODEST_FOLDER_VIEW (*tree_view), FALSE); gtk_container_add (GTK_CONTAINER (scroll), *tree_view); @@ -3352,6 +3721,7 @@ create_move_to_dialog (GtkWindow *win, * Returns TRUE if at least one of the headers of the list belongs to * a message that has been fully retrieved. */ +#if 0 /* no longer in use. delete in 2007.10 */ static gboolean has_retrieved_msgs (TnyList *list) { @@ -3359,14 +3729,15 @@ has_retrieved_msgs (TnyList *list) gboolean found = FALSE; iter = tny_list_create_iterator (list); - while (tny_iterator_is_done (iter) && !found) { + while (!tny_iterator_is_done (iter) && !found) { TnyHeader *header; TnyHeaderFlags flags = 0; header = TNY_HEADER (tny_iterator_get_current (iter)); if (header) { flags = tny_header_get_flags (header); - if (!(flags & TNY_HEADER_FLAG_PARTIAL)) + if (flags & TNY_HEADER_FLAG_CACHED) +/* if (!(flags & TNY_HEADER_FLAG_PARTIAL)) */ found = TRUE; g_object_unref (header); @@ -3379,81 +3750,91 @@ has_retrieved_msgs (TnyList *list) return found; } +#endif /* 0 */ + /* * Shows a confirmation dialog to the user when we're moving messages * from a remote server to the local storage. Returns the dialog - * response. If it's other kind of movement the it always returns + * response. If it's other kind of movement then it always returns * GTK_RESPONSE_OK + * + * This one is used by the next functions: + * modest_ui_actions_on_paste - commented out + * drag_and_drop_from_header_view (for d&d in modest_folder_view.c) */ -static gint +gint msgs_move_to_confirmation (GtkWindow *win, TnyFolder *dest_folder, + gboolean delete, TnyList *headers) { gint response = GTK_RESPONSE_OK; - /* If the destination is a local folder */ - if (modest_tny_folder_is_local_folder (dest_folder)) { - TnyFolder *src_folder = 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; - /* Get source folder */ - iter = tny_list_create_iterator (headers); - header = TNY_HEADER (tny_iterator_get_current (iter)); - if (header) { - src_folder = tny_header_get_folder (header); - g_object_unref (header); - } + TnyFolder *src_folder = NULL; + TnyIterator *iter = NULL; + TnyHeader *header = NULL; - g_object_unref (iter); + /* Get source folder */ + iter = tny_list_create_iterator (headers); + header = TNY_HEADER (tny_iterator_get_current (iter)); + if (header) { + src_folder = tny_header_get_folder (header); + g_object_unref (header); + } + g_object_unref (iter); - /* if no src_folder, message may be an attahcment */ - if (src_folder == NULL) - return GTK_RESPONSE_CANCEL; + /* if no src_folder, message may be an attahcment */ + if (src_folder == NULL) + return GTK_RESPONSE_CANCEL; - /* If the source is a remote folder */ - if (!modest_tny_folder_is_local_folder (src_folder)) { - const gchar *message; - - if (has_retrieved_msgs (headers)) - message = ngettext ("mcen_nc_move_retrieve", "mcen_nc_move_retrieves", - tny_list_get_length (headers)); - else - message = ngettext ("mcen_nc_move_header", "mcen_nc_move_headers", - tny_list_get_length (headers)); - - response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win), - (const gchar *) message); - } - + /* If the source is a local or MMC folder */ + if (!modest_tny_folder_is_remote_folder (src_folder)) { g_object_unref (src_folder); + return GTK_RESPONSE_OK; } - + g_object_unref (src_folder); + + /* now if offline we ask the user */ + if(connect_to_get_msg( GTK_WINDOW (win), + tny_list_get_length (headers))) + response = GTK_RESPONSE_OK; + else + response = GTK_RESPONSE_CANCEL; + return response; } static void -transfer_msgs_from_viewer_cb (const GObject *object, gpointer user_data) +move_to_cb (const GObject *object, gpointer user_data) { ModestMsgViewWindow *self = NULL; + g_return_if_fail (GTK_IS_WIDGET (user_data)); + g_return_if_fail (MODEST_IS_WINDOW (object)); - g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (object)); - 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_IS_MSG_VIEW_WINDOW (object)) { + 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)); + } + gtk_widget_destroy (GTK_WIDGET(user_data)); } void modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op, gpointer user_data) { + ModestMainWindow *main_window = NULL; + GtkWidget *folder_view = NULL; GObject *win = modest_mail_operation_get_source (mail_op); const GError *error = NULL; const gchar *message = NULL; @@ -3466,6 +3847,14 @@ modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op, message = _("mail_in_ui_folder_move_target_error"); } + /* 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)); + } + /* Show notification dialog */ modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL, message); g_object_unref (win); @@ -3650,7 +4039,9 @@ 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; if (!TNY_IS_FOLDER (dst_folder)) { modest_platform_information_banner (GTK_WIDGET (win), @@ -3659,37 +4050,56 @@ modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder, return; } + dst_account = tny_folder_get_account (TNY_FOLDER (dst_folder)); + proto_str = tny_account_get_proto (dst_account); + + /* tinymail will return NULL for local folders it seems */ + dst_is_pop = proto_str && + (modest_protocol_info_get_transport_store_protocol (proto_str) == + MODEST_PROTOCOL_STORE_POP); + + g_object_unref (dst_account); + /* Get selected headers */ headers = get_selected_headers (MODEST_WINDOW (win)); - /* Ask for user confirmation */ - response = msgs_move_to_confirmation (GTK_WINDOW (win), - TNY_FOLDER (dst_folder), - headers); - - /* Transfer messages */ - if (response == GTK_RESPONSE_OK) { - ModestMailOperation *mail_op = - modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, - G_OBJECT(win), - modest_ui_actions_move_folder_error_handler, - NULL); - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), - mail_op); - - modest_mail_operation_xfer_msgs (mail_op, - headers, - TNY_FOLDER (dst_folder), - TRUE, - (MODEST_IS_MSG_VIEW_WINDOW (win)) ? transfer_msgs_from_viewer_cb : NULL, - NULL); + if (dst_is_pop) { + modest_platform_information_banner (GTK_WIDGET (win), + NULL, + ngettext("mail_in_ui_folder_move_target_error", + "mail_in_ui_folder_move_targets_error", + tny_list_get_length (headers))); + g_object_unref (headers); + return; + } - g_object_unref (G_OBJECT (mail_op)); + 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)); } + + ModestMailOperation *mail_op = + modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, + G_OBJECT(win), + modest_ui_actions_move_folder_error_handler, + NULL); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), + mail_op); + + modest_mail_operation_xfer_msgs (mail_op, + headers, + TNY_FOLDER (dst_folder), + TRUE, + move_to_cb, + inf_note); + + g_object_unref (G_OBJECT (mail_op)); g_object_unref (headers); } - /* * UI handler for the "Move to" action when invoked from the * ModestMainWindow @@ -3700,59 +4110,83 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action, TnyFolderStore *dst_folder, ModestMainWindow *win) { - GtkWidget *header_view = NULL; + ModestHeaderView *header_view = NULL; ModestMailOperation *mail_op = NULL; TnyFolderStore *src_folder; + gboolean online = (tny_device_is_online (modest_runtime_get_device())); g_return_if_fail (MODEST_IS_MAIN_WINDOW (win)); /* Get the source folder */ src_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); - - /* Offer the connection dialog if necessary, if the source folder is in a networked account: */ - if (!modest_platform_connect_and_wait_if_network_folderstore (GTK_WINDOW (win), - src_folder)) - goto end; /* Get header view */ - 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_WIDGET_TYPE_HEADER_VIEW)); /* Get folder or messages to transfer */ if (gtk_widget_is_focus (folder_view)) { + GtkTreeSelection *sel; + 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)) - goto end; - - /* Clean folder on header view before moving it */ - modest_header_view_clear (MODEST_HEADER_VIEW (header_view)); - - if (TNY_IS_FOLDER (src_folder)) { - mail_op = - modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, - G_OBJECT(win), - modest_ui_actions_move_folder_error_handler, - NULL); - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), - mail_op); - - modest_mail_operation_xfer_folder (mail_op, - TNY_FOLDER (src_folder), - dst_folder, - TRUE, NULL, NULL); - /* Unref mail operation */ - g_object_unref (G_OBJECT (mail_op)); - } else { - g_warning ("%s: src_folder is not a TnyFolder.\n", __FUNCTION__); - } - } else if (gtk_widget_is_focus (header_view)) { - /* Transfer messages */ - modest_ui_actions_xfer_messages_from_move_to (dst_folder, MODEST_WINDOW (win)); + !MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (dst_folder)) { + do_xfer = FALSE; + } 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_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)) { + do_xfer = FALSE; + } + } + + 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)); + } + /* 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_ui_actions_move_folder_error_handler, + win); + 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, inf_note); + /* Unref mail operation */ + g_object_unref (G_OBJECT (mail_op)); + } + } 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_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; + } + } + if (do_xfer) /* Transfer messages */ + modest_ui_actions_xfer_messages_from_move_to (dst_folder, MODEST_WINDOW (win)); } - - end: + if (src_folder) g_object_unref (src_folder); } @@ -3768,16 +4202,18 @@ modest_ui_actions_on_msg_view_window_move_to (GtkAction *action, ModestMsgViewWindow *win) { TnyHeader *header = NULL; - TnyFolder *src_folder; + TnyFolderStore *src_folder; /* Create header list */ header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win)); - src_folder = tny_header_get_folder(header); + src_folder = TNY_FOLDER_STORE(tny_header_get_folder(header)); g_object_unref (header); - /* Transfer the message */ - if (modest_platform_connect_and_wait_if_network_folderstore (NULL, TNY_FOLDER_STORE (src_folder))) + /* 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))) { modest_ui_actions_xfer_messages_from_move_to (dst_folder, MODEST_WINDOW (win)); + } g_object_unref (src_folder); } @@ -3820,21 +4256,18 @@ modest_ui_actions_on_move_to (GtkAction *action, return; dst_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (tree_view)); - /* Offer the connection dialog if necessary: */ - if (modest_platform_connect_and_wait_if_network_folderstore (GTK_WINDOW (win), - dst_folder)) { - - /* Do window specific stuff */ - if (MODEST_IS_MAIN_WINDOW (win)) - modest_ui_actions_on_main_window_move_to (action, - folder_view, - dst_folder, - MODEST_MAIN_WINDOW (win)); - else - modest_ui_actions_on_msg_view_window_move_to (action, - dst_folder, - MODEST_MSG_VIEW_WINDOW (win)); - } + /* 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); } @@ -3945,49 +4378,42 @@ modest_ui_actions_on_help (GtkAction *action, const gchar *help_id = NULL; if (MODEST_IS_MAIN_WINDOW (win)) { - const gchar *action_name; - action_name = gtk_action_get_name (action); - - if (!strcmp (action_name, "FolderViewCSMHelp") || - !strcmp (action_name, "HeaderViewCSMHelp")) { - GtkWidget *folder_view; - TnyFolderStore *folder_store; - /* Get selected folder */ - folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), - MODEST_WIDGET_TYPE_FOLDER_VIEW); - folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); - - /* Switch help_id */ - if (TNY_IS_FOLDER (folder_store)) { - switch (modest_tny_folder_guess_folder_type (TNY_FOLDER (folder_store))) { - case TNY_FOLDER_TYPE_NORMAL: - help_id = "applications_email_managefolders"; - break; - case TNY_FOLDER_TYPE_INBOX: - help_id = "applications_email_inbox"; - break; - case TNY_FOLDER_TYPE_OUTBOX: - help_id = "applications_email_outbox"; - break; - case TNY_FOLDER_TYPE_SENT: - help_id = "applications_email_sent"; - break; - case TNY_FOLDER_TYPE_DRAFTS: - help_id = "applications_email_drafts"; - break; - case TNY_FOLDER_TYPE_ARCHIVE: - help_id = "applications_email_managefolders"; - break; - default: - help_id = "applications_email_managefolders"; - } - } else { - help_id = "applications_email_mainview"; + GtkWidget *folder_view; + TnyFolderStore *folder_store; + + /* Get selected folder */ + folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), + MODEST_WIDGET_TYPE_FOLDER_VIEW); + folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); + + /* Switch help_id */ + if (TNY_IS_FOLDER (folder_store)) { + switch (modest_tny_folder_guess_folder_type (TNY_FOLDER (folder_store))) { + case TNY_FOLDER_TYPE_NORMAL: + help_id = "applications_email_managefolders"; + break; + case TNY_FOLDER_TYPE_INBOX: + help_id = "applications_email_inbox"; + break; + case TNY_FOLDER_TYPE_OUTBOX: + help_id = "applications_email_outbox"; + break; + case TNY_FOLDER_TYPE_SENT: + help_id = "applications_email_sent"; + break; + case TNY_FOLDER_TYPE_DRAFTS: + help_id = "applications_email_drafts"; + break; + case TNY_FOLDER_TYPE_ARCHIVE: + help_id = "applications_email_managefolders"; + break; + default: + help_id = "applications_email_managefolders"; } - g_object_unref (folder_store); } else { - help_id = "applications_email_mainview"; + help_id = "applications_email_mainview"; } + g_object_unref (folder_store); } else if (MODEST_IS_MSG_VIEW_WINDOW (win)) { help_id = "applications_email_viewer"; } else if (MODEST_IS_MSG_EDIT_WINDOW (win)) @@ -4026,7 +4452,7 @@ modest_ui_actions_on_email_menu_activated (GtkAction *action, ModestWindow *window) { g_return_if_fail (MODEST_IS_WINDOW (window)); - + /* Update dimmed */ modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules"); }