X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=518816e93596042624c3d180c8aeae20b957bdcb;hb=e374da56f67092cecb1572dd4bee2ca34e0bc04c;hp=27c367f152f4df2c58c73642bedec4135b8b4078;hpb=0ffc9dc83675e3ffa629cb61f15aead9226de6e9;p=modest diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index 27c367f..518816e 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -49,7 +49,10 @@ #include #include #ifdef MODEST_TOOLKIT_HILDON2 +#include #include +#include +#include #endif #ifdef MODEST_PLATFORM_MAEMO @@ -72,15 +75,6 @@ #include "modest-account-mgr-helpers.h" #include "modest-mail-operation.h" #include "modest-text-utils.h" - -#ifdef MODEST_HAVE_EASYSETUP -#ifdef MODEST_TOOLKIT_HILDON2 -#include "modest-easysetup-wizard-dialog.h" -#else -#include "easysetup/modest-easysetup-wizard-dialog.h" -#endif -#endif /* MODEST_HAVE_EASYSETUP */ - #include #include #include @@ -91,8 +85,7 @@ #include #define MIN_FREE_SPACE 5 * 1024 * 1024 -#define MOVE_FOLDER_OK_BUTTON "ok-button" -#define MOVE_FOLDER_NEW_BUTTON "new-button" +#define MODEST_MOVE_TO_DIALOG_FOLDER_VIEW "move-to-dialog-folder-view" typedef struct _GetMsgAsyncHelper { ModestWindow *window; @@ -127,6 +120,10 @@ typedef struct _PasteAsAttachmentHelper { GtkWidget *banner; } PasteAsAttachmentHelper; +typedef struct { + TnyList *list; + ModestWindow *win; +} MoveToInfo; /* * The do_headers_action uses this kind of functions to perform some @@ -173,10 +170,18 @@ 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); - static TnyAccount *get_account_from_folder_store (TnyFolderStore *folder_store); +static void modest_ui_actions_on_main_window_move_to (GtkAction *action, + GtkWidget *folder_view, + TnyFolderStore *dst_folder, + ModestMainWindow *win); + +static void modest_ui_actions_on_window_move_to (GtkAction *action, + TnyList *list_to_move, + TnyFolderStore *dst_folder, + ModestWindow *win); + /* * This function checks whether a TnyFolderStore is a pop account */ @@ -307,6 +312,13 @@ get_selected_headers (ModestWindow *win) return list; +#ifdef MODEST_TOOLKIT_HILDON2 + } else if (MODEST_IS_HEADER_WINDOW (win)) { + GtkWidget *header_view; + + header_view = GTK_WIDGET (modest_header_window_get_header_view (MODEST_HEADER_WINDOW (win))); + return modest_header_view_get_selected_headers (MODEST_HEADER_VIEW(header_view)); +#endif } else return NULL; } @@ -387,6 +399,12 @@ modest_ui_actions_refresh_message_window_after_delete (ModestMsgViewWindow* win) void modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) { + modest_ui_actions_on_edit_mode_delete_message (win); +} + +gboolean +modest_ui_actions_on_edit_mode_delete_message (ModestWindow *win) +{ TnyList *header_list = NULL; TnyIterator *iter = NULL; TnyHeader *header = NULL; @@ -395,8 +413,9 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) gint response; ModestWindowMgr *mgr; GtkWidget *header_view = NULL; + gboolean retval = TRUE; - g_return_if_fail (MODEST_IS_WINDOW(win)); + g_return_val_if_fail (MODEST_IS_WINDOW(win), FALSE); /* Check first if the header view has the focus */ if (MODEST_IS_MAIN_WINDOW (win)) { @@ -404,13 +423,13 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); if (!gtk_widget_is_focus (header_view)) - return; + return FALSE; } /* 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; + if (!header_list) return FALSE; /* Check if any of the headers are already opened, or in the process of being opened */ if (MODEST_IS_MAIN_WINDOW (win)) { @@ -439,7 +458,7 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) g_free (msg); g_object_unref (header_list); - return; + return FALSE; } } @@ -520,7 +539,7 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) /* Get main window */ mgr = modest_runtime_get_window_mgr (); main_window = modest_window_mgr_get_main_window (mgr, FALSE); /* don't create */ - } else { + } else if (MODEST_IS_MAIN_WINDOW (win)) { /* Move cursor to next row */ main_window = win; @@ -552,12 +571,17 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) /* Free */ g_list_foreach (sel_list, (GFunc) gtk_tree_path_free, NULL); g_list_free (sel_list); + retval = TRUE; + } else { + retval = FALSE; } /* Free*/ g_free(message); g_free(desc); g_object_unref (header_list); + + return retval; } @@ -633,6 +657,14 @@ modest_ui_actions_on_close_window (GtkAction *action, ModestWindow *win) } void +modest_ui_actions_add_to_contacts (GtkAction *action, ModestWindow *win) +{ + g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (win)); + + modest_msg_view_window_add_to_contacts (MODEST_MSG_VIEW_WINDOW (win)); +} + +void modest_ui_actions_on_add_to_contacts (GtkAction *action, ModestWindow *win) { GtkClipboard *clipboard = NULL; @@ -652,19 +684,19 @@ modest_ui_actions_on_add_to_contacts (GtkAction *action, ModestWindow *win) } void -modest_ui_actions_on_accounts (GtkAction *action, +modest_ui_actions_on_accounts (GtkAction *action, ModestWindow *win) { /* This is currently only implemented for Maemo */ if (!modest_account_mgr_has_accounts (modest_runtime_get_account_mgr(), TRUE)) { - if (!modest_ui_actions_run_account_setup_wizard (win)) + if (!modest_ui_actions_run_account_setup_wizard (win)) g_debug ("%s: wizard was already running", __FUNCTION__); - + return; } else { /* Show the list of accounts */ GtkWindow *account_win = GTK_WINDOW (modest_account_view_window_new ()); - + /* The accounts dialog must be modal */ modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (account_win), (GtkWindow *) win); modest_utils_show_dialog_and_forget (GTK_WINDOW (win), GTK_DIALOG (account_win)); @@ -679,7 +711,7 @@ modest_ui_actions_on_smtp_servers (GtkAction *action, ModestWindow *win) * possiblities. */ #ifndef MODEST_TOOLKIT_GTK /* Defined in config.h */ - + /* Create the window if necessary: */ GtkWidget *specific_window = GTK_WIDGET (modest_connection_specific_smtp_window_new ()); modest_connection_specific_smtp_window_fill_with_connections ( @@ -763,7 +795,7 @@ modest_ui_actions_compose_msg(ModestWindow *win, allowed_size = MODEST_MAX_ATTACHMENT_SIZE; msg_win = modest_msg_edit_window_new (msg, account_name, FALSE); - if (!modest_window_mgr_register_window (modest_runtime_get_window_mgr(), msg_win, NULL)) { + if (!modest_window_mgr_register_window (modest_runtime_get_window_mgr(), msg_win, win)) { gtk_widget_destroy (GTK_WIDGET (msg_win)); goto cleanup; } @@ -864,9 +896,9 @@ typedef struct { typedef struct { GtkTreeModel *model; - TnyList *headers; + TnyHeader *header; OpenMsgBannerInfo *banner_info; - GHashTable *row_refs_per_header; + GtkTreeRowReference *rowref; } OpenMsgHelper; gboolean @@ -886,43 +918,42 @@ open_msg_banner_idle (gpointer userdata) } -static void -open_msg_cb (ModestMailOperation *mail_op, - TnyHeader *header, - gboolean canceled, - TnyMsg *msg, - GError *err, - gpointer user_data) +static GtkWidget * +get_header_view_from_window (ModestWindow *window) { - ModestWindowMgr *mgr = NULL; - ModestWindow *parent_win = NULL; - ModestWindow *win = NULL; - TnyFolderType folder_type = TNY_FOLDER_TYPE_UNKNOWN; - gchar *account = NULL; - TnyFolder *folder; - gboolean open_in_editor = FALSE; - OpenMsgHelper *helper = (OpenMsgHelper *) user_data; + GtkWidget *header_view; - /* 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)) - return; + if (MODEST_IS_MAIN_WINDOW (window)) { + header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (window), + MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); +#ifdef MODEST_TOOLKIT_HILDON2 + } else if (MODEST_IS_HEADER_WINDOW (window)){ + header_view = GTK_WIDGET (modest_header_window_get_header_view (MODEST_HEADER_WINDOW (window))); +#endif + } else { + header_view = NULL; + } - parent_win = (ModestWindow *) modest_mail_operation_get_source (mail_op); - folder = tny_header_get_folder (header); + return header_view; +} - /* Mark header as read */ - headers_action_mark_as_read (header, MODEST_WINDOW(parent_win), NULL); +static gchar * +get_info_from_header (TnyHeader *header, gboolean *is_draft) +{ + TnyFolder *folder; + gchar *account = NULL; + TnyFolderType folder_type = TNY_FOLDER_TYPE_UNKNOWN; + + *is_draft = FALSE; + folder = tny_header_get_folder (header); /* Gets folder type (OUTBOX headers will be opened in edit window */ if (modest_tny_folder_is_local_folder (folder)) { folder_type = modest_tny_folder_get_local_or_mmc_folder_type (folder); if (folder_type == TNY_FOLDER_TYPE_INVALID) g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__); } - - + if (folder_type == TNY_FOLDER_TYPE_OUTBOX) { TnyTransportAccount *traccount = NULL; ModestTnyAccountStore *accstore = modest_runtime_get_account_store(); @@ -937,21 +968,19 @@ open_msg_cb (ModestMailOperation *mail_op, if (TNY_IS_SEND_QUEUE (send_queue)) { msg_id = modest_tny_send_queue_get_msg_id (header); status = modest_tny_send_queue_get_msg_status(send_queue, msg_id); - g_free(msg_id); - + g_free (msg_id); /* Only open messages in outbox with the editor if they are in Failed state */ if (status == MODEST_TNY_SEND_QUEUE_FAILED) { - open_in_editor = TRUE; - } -#ifdef MODEST_TOOLKIT_HILDON2 + *is_draft = TRUE; + } +#ifdef MODEST_TOOLKIT_HILDON2 else { /* In Fremantle we can not open any message from outbox which is not in failed state */ g_object_unref(traccount); - goto cleanup; - } + } #endif } g_object_unref(traccount); @@ -959,15 +988,48 @@ open_msg_cb (ModestMailOperation *mail_op, g_warning("Cannot get transport account for message in outbox!!"); } } else if (folder_type == TNY_FOLDER_TYPE_DRAFTS) { - open_in_editor = TRUE; /* Open in editor if the message is in the Drafts folder */ + *is_draft = TRUE; /* Open in editor if the message is in the Drafts folder */ } + g_object_unref (folder); + + return account; +} + +static void +open_msg_cb (ModestMailOperation *mail_op, + TnyHeader *header, + gboolean canceled, + TnyMsg *msg, + GError *err, + gpointer user_data) +{ + ModestWindowMgr *mgr = NULL; + ModestWindow *parent_win = NULL; + ModestWindow *win = NULL; + gchar *account = NULL; + gboolean open_in_editor = FALSE; + OpenMsgHelper *helper = (OpenMsgHelper *) user_data; + + /* 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)) + return; + + parent_win = (ModestWindow *) modest_mail_operation_get_source (mail_op); + + /* Mark header as read */ + headers_action_mark_as_read (header, MODEST_WINDOW(parent_win), NULL); + + account = get_info_from_header (header, &open_in_editor); + /* Get account */ if (!account) account = g_strdup (modest_window_get_active_account (MODEST_WINDOW (parent_win))); if (!account) account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr()); - + if (open_in_editor) { ModestAccountMgr *mgr = modest_runtime_get_account_mgr (); gchar *from_header = NULL, *acc_name; @@ -995,19 +1057,15 @@ open_msg_cb (ModestMailOperation *mail_op, } else { gchar *uid = modest_tny_folder_get_header_unique_id (header); - if (MODEST_IS_MAIN_WINDOW (parent_win)) { - GtkTreeRowReference *row_reference; - - row_reference = (GtkTreeRowReference *) g_hash_table_lookup (helper->row_refs_per_header, header); - + if (helper->rowref && helper->model) { win = modest_msg_view_window_new_with_header_model (msg, account, (const gchar*) uid, - helper->model, row_reference); + helper->model, helper->rowref); } else { win = modest_msg_view_window_new_for_attachment (msg, account, (const gchar*) uid); } g_free (uid); } - + /* Register and show new window */ if (win != NULL) { mgr = modest_runtime_get_window_mgr (); @@ -1027,7 +1085,6 @@ cleanup: /* Free */ g_free(account); g_object_unref (parent_win); - g_object_unref (folder); } static gboolean @@ -1160,18 +1217,24 @@ get_account_from_header_list (TnyList *headers) return account; } -static void -foreach_unregister_headers (gpointer data, - gpointer user_data) +static TnyAccount* +get_account_from_header (TnyHeader *header) { - ModestWindowMgr *mgr = (ModestWindowMgr *) user_data; - TnyHeader *header = TNY_HEADER (data); + TnyAccount *account = NULL; + TnyFolder *folder; - modest_window_mgr_unregister_header (mgr, header); + folder = tny_header_get_folder (header); + + if (folder) { + account = tny_folder_get_account (folder); + g_object_unref (folder); + } + + return account; } static void -open_msgs_helper_destroyer (gpointer user_data) +open_msg_helper_destroyer (gpointer user_data) { OpenMsgHelper *helper = (OpenMsgHelper *) user_data; @@ -1190,13 +1253,13 @@ open_msgs_helper_destroyer (gpointer user_data) helper->banner_info = NULL; } g_object_unref (helper->model); - g_object_unref (helper->headers); - g_hash_table_destroy (helper->row_refs_per_header); + g_object_unref (helper->header); + gtk_tree_row_reference_free (helper->rowref); g_slice_free (OpenMsgHelper, helper); } static void -open_msgs_performer(gboolean canceled, +open_msg_performer(gboolean canceled, GError *err, GtkWindow *parent_window, TnyAccount *account, @@ -1205,25 +1268,21 @@ open_msgs_performer(gboolean canceled, ModestMailOperation *mail_op = NULL; gchar *error_msg; ModestProtocolType proto; - TnyList *not_opened_headers; TnyConnectionStatus status; gboolean show_open_draft = FALSE; OpenMsgHelper *helper = NULL; helper = (OpenMsgHelper *) user_data; - not_opened_headers = helper->headers; status = tny_account_get_connection_status (account); if (err || canceled) { - /* Unregister the already registered headers */ - tny_list_foreach (not_opened_headers, foreach_unregister_headers, - modest_runtime_get_window_mgr ()); + modest_window_mgr_unregister_header (modest_runtime_get_window_mgr (), helper->header); /* Free the helper */ - open_msgs_helper_destroyer (helper); - + open_msg_helper_destroyer (helper); + /* In memory full conditions we could get this error here */ check_memory_full_error ((GtkWidget *) parent_window, err); - + goto clean; } @@ -1232,52 +1291,65 @@ open_msgs_performer(gboolean canceled, if (proto == MODEST_PROTOCOL_REGISTRY_TYPE_INVALID) { proto = MODEST_PROTOCOLS_STORE_MAILDIR; } + + ModestProtocol *protocol; + ModestProtocolRegistry *protocol_registry; + gchar *subject; + + protocol_registry = modest_runtime_get_protocol_registry (); + subject = tny_header_dup_subject (helper->header); - /* Create the error messages */ - if (tny_list_get_length (not_opened_headers) == 1) { - ModestProtocol *protocol; - ModestProtocolRegistry *protocol_registry; - TnyIterator *iter; - TnyHeader *header; - gchar *subject; - - protocol_registry = modest_runtime_get_protocol_registry (); - iter = tny_list_create_iterator (not_opened_headers); - header = TNY_HEADER (tny_iterator_get_current (iter)); - subject = tny_header_dup_subject (header); + protocol = modest_protocol_registry_get_protocol_by_type (protocol_registry, proto); + error_msg = modest_protocol_get_translation (protocol, MODEST_PROTOCOL_TRANSLATION_MSG_NOT_AVAILABLE, subject); + if (subject) + g_free (subject); + + if (error_msg == NULL) { + error_msg = g_strdup (_("mail_ni_ui_folder_get_msg_folder_error")); + } - protocol = modest_protocol_registry_get_protocol_by_type (protocol_registry, proto); - error_msg = modest_protocol_get_translation (protocol, MODEST_PROTOCOL_TRANSLATION_MSG_NOT_AVAILABLE, subject); - if (subject) - g_free (subject); - g_object_unref (header); - g_object_unref (iter); + if (modest_protocol_registry_protocol_type_has_tag (protocol_registry, + proto, + MODEST_PROTOCOL_REGISTRY_LOCAL_STORE_PROTOCOLS)) { + TnyFolder *folder; + TnyFolderType folder_type; - if (error_msg == NULL) { - error_msg = g_strdup (_("mail_ni_ui_folder_get_msg_folder_error")); - } + folder = tny_header_get_folder (helper->header); + folder_type = modest_tny_folder_get_local_or_mmc_folder_type (folder); + show_open_draft = (folder_type == TNY_FOLDER_TYPE_DRAFTS); + g_object_unref (folder); + } - if (modest_protocol_registry_protocol_type_has_tag (protocol_registry, - proto, - MODEST_PROTOCOL_REGISTRY_LOCAL_STORE_PROTOCOLS)) { - TnyHeader *header; - TnyFolder *folder; - TnyIterator *iter; - TnyFolderType folder_type; +#ifdef MODEST_TOOLKIT_HILDON2 + gboolean is_draft; + gchar *account_name = get_info_from_header (helper->header, &is_draft); - iter = tny_list_create_iterator (not_opened_headers); - header = TNY_HEADER (tny_iterator_get_current (iter)); - folder = tny_header_get_folder (header); - folder_type = modest_tny_folder_get_local_or_mmc_folder_type (folder); - show_open_draft = (folder_type == TNY_FOLDER_TYPE_DRAFTS); - g_object_unref (folder); - g_object_unref (header); - g_object_unref (iter); + if (!is_draft) { + ModestWindow *window; + GtkWidget *header_view; + gchar *uid; + + header_view = get_header_view_from_window (MODEST_WINDOW (parent_window)); + uid = modest_tny_folder_get_header_unique_id (helper->header); + if (header_view) { + window = modest_msg_view_window_new_from_header_view + (MODEST_HEADER_VIEW (header_view), account_name, uid, helper->rowref); + if (window != NULL) { + if (!modest_window_mgr_register_window (modest_runtime_get_window_mgr (), + window, NULL)) { + gtk_widget_destroy (GTK_WIDGET (window)); + } else { + gtk_widget_show_all (GTK_WIDGET(window)); + } + } } - } else { - error_msg = g_strdup (_("mail_ni_ui_folder_get_msg_folder_error")); + g_free (account_name); + g_free (uid); + open_msg_helper_destroyer (helper); + goto clean; } - + g_free (account_name); +#endif /* Create the mail operation */ mail_op = modest_mail_operation_new_with_error_handling ((GObject *) parent_window, @@ -1298,11 +1370,15 @@ open_msgs_performer(gboolean canceled, helper->banner_info); } + TnyList *headers; + headers = TNY_LIST (tny_simple_list_new ()); + tny_list_prepend (headers, G_OBJECT (helper->header)); modest_mail_operation_get_msgs_full (mail_op, - not_opened_headers, + headers, open_msg_cb, helper, - open_msgs_helper_destroyer); + open_msg_helper_destroyer); + g_object_unref (headers); /* Frees */ clean: @@ -1317,177 +1393,100 @@ open_msgs_performer(gboolean canceled, * same when trying to open messages. */ static void -open_msgs_from_headers (TnyList *headers, ModestWindow *win) +open_msg_from_header (TnyHeader *header, GtkTreeRowReference *rowref, ModestWindow *win) { ModestWindowMgr *mgr = NULL; - TnyIterator *iter = NULL, *iter_not_opened = NULL; - TnyList *not_opened_headers = NULL; - TnyHeaderFlags flags = 0; TnyAccount *account; - gint uncached_msgs = 0; - GtkWidget *header_view; - GtkTreeModel *model; - GHashTable *refs_for_headers; + gboolean cached = FALSE; + gboolean found; + GtkWidget *header_view = NULL; OpenMsgHelper *helper; - GtkTreeSelection *sel; - GList *sel_list = NULL, *sel_list_iter = NULL; + ModestWindow *window; + + g_return_if_fail (header != NULL && rowref != NULL); - g_return_if_fail (headers != NULL); + mgr = modest_runtime_get_window_mgr (); - /* Check that only one message is selected for opening */ - if (tny_list_get_length (headers) != 1) { - modest_platform_information_banner ((win) ? GTK_WIDGET (win) : NULL, - NULL, _("mcen_ib_select_one_message")); + /* get model */ + header_view = get_header_view_from_window (MODEST_WINDOW (win)); + if (header_view == NULL) return; - } - - mgr = modest_runtime_get_window_mgr (); - iter = tny_list_create_iterator (headers); /* Get the account */ - account = get_account_from_header_list (headers); - + account = get_account_from_header (header); if (!account) return; - /* Get the selections, we need to get the references to the - rows here because the treeview/model could dissapear (the - user might want to select another folder)*/ - header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); - sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (header_view)); - model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)); - sel_list = gtk_tree_selection_get_selected_rows (sel, &model); - refs_for_headers = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, - (GDestroyNotify) gtk_tree_row_reference_free); - - /* Look if we already have a message view for each header. If - true, then remove the header from the list of headers to - open */ - sel_list_iter = sel_list; - not_opened_headers = tny_simple_list_new (); - while (!tny_iterator_is_done (iter) && sel_list_iter) { - - ModestWindow *window = NULL; - TnyHeader *header = NULL; - gboolean found = FALSE; - - header = TNY_HEADER (tny_iterator_get_current (iter)); - if (header) - flags = tny_header_get_flags (header); - - window = NULL; - found = modest_window_mgr_find_registered_header (mgr, header, &window); - - /* Do not open again the message and present the - window to the user */ - if (found) { - if (window) { + window = NULL; + found = modest_window_mgr_find_registered_header (mgr, header, &window); + + /* Do not open again the message and present the + window to the user */ + if (found) { + if (window) { #ifndef MODEST_TOOLKIT_HILDON2 - gtk_window_present (GTK_WINDOW (window)); + gtk_window_present (GTK_WINDOW (window)); #endif - } else { - /* the header has been registered already, we don't do - * anything but wait for the window to come up*/ - g_debug ("header %p already registered, waiting for window", header); - } } else { - GtkTreeRowReference *row_reference; - - tny_list_append (not_opened_headers, G_OBJECT (header)); - /* Create a new row reference and add it to the hash table */ - row_reference = gtk_tree_row_reference_new (model, (GtkTreePath *) sel_list_iter->data); - g_hash_table_insert (refs_for_headers, header, row_reference); + /* the header has been registered already, we don't do + * anything but wait for the window to come up*/ + g_debug ("header %p already registered, waiting for window", header); } - - if (header) - g_object_unref (header); - - /* Go to next */ - tny_iterator_next (iter); - sel_list_iter = g_list_next (sel_list_iter); + goto cleanup; } - g_object_unref (iter); - iter = NULL; - g_list_foreach (sel_list, (GFunc) gtk_tree_path_free, NULL); - g_list_free (sel_list); /* Open each message */ - if (tny_list_get_length (not_opened_headers) == 0) { - g_hash_table_destroy (refs_for_headers); - goto cleanup; - } - - /* If some messages would have to be downloaded, ask the user to - * make a connection. It's generally easier to do this here (in the mainloop) - * than later in a thread: - */ - if (tny_list_get_length (not_opened_headers) > 0) { - uncached_msgs = header_list_count_uncached_msgs (not_opened_headers); - - if (uncached_msgs > 0) { - /* Allways download if we are online. */ - if (!tny_device_is_online (modest_runtime_get_device ())) { - gint response; - - /* If ask for user permission to download the messages */ - response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win), - ngettext("mcen_nc_get_msg", - "mcen_nc_get_msgs", - uncached_msgs)); - - /* End if the user does not want to continue */ - if (response == GTK_RESPONSE_CANCEL) { - g_hash_table_destroy (refs_for_headers); - goto cleanup; - } + cached = tny_header_get_flags (header) & TNY_HEADER_FLAG_CACHED; + if (!cached) { + /* Allways download if we are online. */ + if (!tny_device_is_online (modest_runtime_get_device ())) { + gint response; + + /* If ask for user permission to download the messages */ + response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win), + _("mcen_nc_get_msg")); + + /* End if the user does not want to continue */ + if (response == GTK_RESPONSE_CANCEL) { + goto cleanup; } } } - /* Register the headers before actually creating the windows: */ - iter_not_opened = tny_list_create_iterator (not_opened_headers); - while (!tny_iterator_is_done (iter_not_opened)) { - TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter_not_opened)); - if (header) { - modest_window_mgr_register_header (mgr, header, NULL); - g_object_unref (header); - } - tny_iterator_next (iter_not_opened); - } - g_object_unref (iter_not_opened); - iter_not_opened = NULL; + /* We register the window for opening */ + modest_window_mgr_register_header (mgr, header, NULL); /* Create the helper. We need to get a reference to the model here because it could change while the message is readed (the user could switch between folders) */ helper = g_slice_new (OpenMsgHelper); - helper->model = g_object_ref (model); - helper->headers = g_object_ref (not_opened_headers); - helper->row_refs_per_header = refs_for_headers; + helper->model = g_object_ref (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view))); + helper->header = g_object_ref (header); + helper->rowref = gtk_tree_row_reference_copy (rowref); helper->banner_info = NULL; /* Connect to the account and perform */ - if (uncached_msgs > 0) { + if (!cached) { modest_platform_connect_and_perform ((GtkWindow *) win, TRUE, g_object_ref (account), - open_msgs_performer, helper); + open_msg_performer, helper); } else { /* Call directly the performer, do not need to connect */ - open_msgs_performer (FALSE, NULL, (GtkWindow *) win, - g_object_ref (account), helper); + open_msg_performer (FALSE, NULL, (GtkWindow *) win, + g_object_ref (account), helper); } cleanup: /* Clean */ if (account) g_object_unref (account); - if (not_opened_headers) - g_object_unref (not_opened_headers); } void modest_ui_actions_on_open (GtkAction *action, ModestWindow *win) { TnyList *headers; + TnyHeader *header; + gint headers_count; + TnyIterator *iter; /* we check for low-mem; in that case, show a warning, and don't allow * opening @@ -1500,12 +1499,39 @@ modest_ui_actions_on_open (GtkAction *action, ModestWindow *win) if (!headers) return; + headers_count = tny_list_get_length (headers); + if (headers_count != 1) { + if (headers_count > 1) { + /* Don't allow activation if there are more than one message selected */ + modest_platform_information_banner (NULL, NULL, _("mcen_ib_select_one_message")); + } + + g_object_unref (headers); + return; + } + + iter = tny_list_create_iterator (headers); + header = TNY_HEADER (tny_iterator_get_current (iter)); + g_object_unref (iter); + /* Open them */ - open_msgs_from_headers (headers, win); + if (header) { + open_msg_from_header (header, NULL, win); + g_object_unref (header); + } g_object_unref(headers); } +static void +rf_helper_window_closed (gpointer data, + GObject *object) +{ + ReplyForwardHelper *helper = (ReplyForwardHelper *) data; + + helper->parent_window = NULL; +} + static ReplyForwardHelper* create_reply_forward_helper (ReplyForwardAction action, ModestWindow *win, @@ -1524,6 +1550,13 @@ create_reply_forward_helper (ReplyForwardAction action, g_strdup (active_acc) : modest_account_mgr_get_default_account (modest_runtime_get_account_mgr()); + /* Note that window could be destroyed just AFTER calling + register_window so we must ensure that this pointer does + not hold invalid references */ + if (rf_helper->parent_window) + g_object_weak_ref (G_OBJECT (rf_helper->parent_window), + rf_helper_window_closed, rf_helper); + return rf_helper; } @@ -1536,6 +1569,9 @@ free_reply_forward_helper (gpointer data) g_free (helper->account_name); if (helper->header) g_object_unref (helper->header); + if (helper->parent_window) + g_object_weak_unref (G_OBJECT (helper->parent_window), + rf_helper_window_closed, helper); g_slice_free (ReplyForwardHelper, helper); } @@ -1621,7 +1657,8 @@ reply_forward_cb (ModestMailOperation *mail_op, mgr = modest_runtime_get_window_mgr (); modest_window_mgr_register_window (mgr, msg_win, (ModestWindow *) rf_helper->parent_window); - if (rf_helper->parent_window != NULL) { + /* Note that register_window could have deleted the account */ + if (MODEST_IS_WINDOW (rf_helper->parent_window)) { gdouble parent_zoom; parent_zoom = modest_window_get_zoom (MODEST_WINDOW (rf_helper->parent_window)); @@ -1734,9 +1771,9 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) { ReplyForwardHelper *rf_helper = NULL; guint reply_forward_type; - + g_return_if_fail (MODEST_IS_WINDOW(win)); - + /* we check for low-mem; in that case, show a warning, and don't allow * reply/forward (because it could potentially require a lot of memory */ if (modest_platform_check_memory_low (MODEST_WINDOW(win), TRUE)) @@ -1748,10 +1785,10 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) if (!modest_ui_actions_run_account_setup_wizard (win)) return; } - + reply_forward_type = modest_conf_get_int (modest_runtime_get_conf (), - (action == ACTION_FORWARD) ? + (action == ACTION_FORWARD) ? MODEST_CONF_FORWARD_TYPE : MODEST_CONF_REPLY_TYPE, NULL); @@ -1766,13 +1803,13 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) if (msg && header) { /* Create helper */ - rf_helper = create_reply_forward_helper (action, win, + rf_helper = create_reply_forward_helper (action, win, reply_forward_type, header); reply_forward_cb (NULL, header, FALSE, msg, NULL, rf_helper); } else { g_warning("%s: no message or header found in viewer\n", __FUNCTION__); } - + if (msg) g_object_unref (msg); if (header) @@ -1822,19 +1859,19 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) /* Allways download if we are online. */ if (!tny_device_is_online (modest_runtime_get_device ())) { gint response; - + /* If ask for user permission to download the messages */ response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win), ngettext("mcen_nc_get_msg", "mcen_nc_get_msgs", uncached_msgs)); - + /* End if the user does not want to continue */ if (response == GTK_RESPONSE_CANCEL) download = FALSE; } } - + if (download) { /* Create helper */ rf_helper = create_reply_forward_helper (action, win, @@ -1935,21 +1972,27 @@ void modest_ui_actions_on_sort (GtkAction *action, ModestWindow *window) { + GtkWidget *header_view = NULL; + g_return_if_fail (MODEST_IS_WINDOW(window)); if (MODEST_IS_MAIN_WINDOW (window)) { - GtkWidget *header_view; header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(window), MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); - if (!header_view) { - modest_platform_information_banner (NULL, NULL, _CS("ckdg_ib_nothing_to_sort")); - - return; - } +#ifdef MODEST_TOOLKIT_HILDON2 + } else if (MODEST_IS_HEADER_WINDOW (window)) { + header_view = GTK_WIDGET (modest_header_window_get_header_view (MODEST_HEADER_WINDOW (window))); +#endif + } - /* Show sorting dialog */ - modest_utils_run_sort_dialog (GTK_WINDOW (window), MODEST_SORT_HEADERS); + if (!header_view) { + modest_platform_information_banner (NULL, NULL, _CS("ckdg_ib_nothing_to_sort")); + + return; } + + /* Show sorting dialog */ + modest_utils_run_sort_dialog (GTK_WINDOW (window), MODEST_SORT_HEADERS); } static void @@ -2244,11 +2287,20 @@ modest_ui_actions_on_send_receive (GtkAction *action, ModestWindow *win) if (folder_store) g_object_unref (folder_store); - } + /* Refresh the active account. Force the connection if needed + and poke the status of all folders */ + modest_ui_actions_do_send_receive (NULL, TRUE, TRUE, TRUE, win); +#ifdef MODEST_TOOLKIT_HILDON2 + } else if (MODEST_IS_ACCOUNTS_WINDOW (win)) { + modest_ui_actions_do_send_receive_all (win, TRUE, TRUE, TRUE); +#endif + } else { + const gchar *active_account; + active_account = modest_window_get_active_account (MODEST_WINDOW (win)); + + modest_ui_actions_do_send_receive (active_account, TRUE, TRUE, TRUE, win); + } - /* Refresh the active account. Force the connection if needed - and poke the status of all folders */ - modest_ui_actions_do_send_receive (NULL, TRUE, TRUE, TRUE, win); } @@ -2325,16 +2377,18 @@ modest_ui_actions_on_header_selected (ModestHeaderView *header_view, void modest_ui_actions_on_header_activated (ModestHeaderView *header_view, TnyHeader *header, - ModestMainWindow *main_window) + GtkTreePath *path, + ModestWindow *window) { - TnyList *headers; + GtkWidget *open_widget; + GtkTreeRowReference *rowref; - g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window)); - - if (!header) - return; + g_return_if_fail (MODEST_IS_WINDOW(window)); + g_return_if_fail (MODEST_IS_HEADER_VIEW (header_view)); + g_return_if_fail (TNY_IS_HEADER (header)); if (modest_header_view_count_selected_headers (header_view) > 1) { + /* Don't allow activation if there are more than one message selected */ modest_platform_information_banner (NULL, NULL, _("mcen_ib_select_one_message")); return; } @@ -2342,16 +2396,19 @@ modest_ui_actions_on_header_activated (ModestHeaderView *header_view, /* we check for low-mem; in that case, show a warning, and don't allow * activating headers */ - if (modest_platform_check_memory_low (MODEST_WINDOW(main_window), TRUE)) + if (modest_platform_check_memory_low (MODEST_WINDOW(window), TRUE)) return; - modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (main_window)); - - headers = modest_header_view_get_selected_headers (header_view); - - open_msgs_from_headers (headers, MODEST_WINDOW (main_window)); + if (MODEST_IS_MAIN_WINDOW (window)) { + modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (window)); + open_widget = modest_window_get_action_widget (MODEST_WINDOW (window), "/MenuBar/EmailMenu/EmailOpenMenu"); + if (!GTK_WIDGET_IS_SENSITIVE (open_widget)) + return; + } - g_object_unref (headers); + rowref = gtk_tree_row_reference_new (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)), path); + open_msg_from_header (header, rowref, MODEST_WINDOW (window)); + gtk_tree_row_reference_free (rowref); } static void @@ -2484,6 +2541,7 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view, modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view), TNY_FOLDER (folder_store), TRUE, + MODEST_WINDOW (main_window), folder_refreshed_cb, main_window); @@ -2588,7 +2646,7 @@ modest_ui_actions_on_msg_link_contextual (ModestMsgView *msgview, const gchar* l void modest_ui_actions_on_msg_attachment_clicked (ModestMsgView *msgview, TnyMimePart *mime_part, ModestWindow *win) -{ +{ /* we check for low-mem; in that case, show a warning, and don't allow * viewing attachments */ @@ -2612,6 +2670,9 @@ on_save_to_drafts_cb (ModestMailOperation *mail_op, gpointer user_data) { ModestMsgEditWindow *edit_window; + + /* TODO: in hildon 2 we have to dim and undim the header views while we're saving */ +#ifndef MODEST_TOOLKIT_HILDON2 ModestMainWindow *win; /* FIXME. Make the header view sensitive again. This is a @@ -2624,6 +2685,7 @@ on_save_to_drafts_cb (ModestMailOperation *mail_op, win, MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); if (hdrview) gtk_widget_set_sensitive(hdrview, TRUE); } +#endif edit_window = MODEST_MSG_EDIT_WINDOW (user_data); @@ -3162,7 +3224,7 @@ do_create_folder_cb (ModestMailOperation *mail_op, #endif } else { /* the 'source_win' is either the ModestMainWindow, or the 'Move to folder'-dialog - * FIXME: any other? */ + * FIXME: any other? */ GtkWidget *folder_view; if (MODEST_IS_MAIN_WINDOW(source_win)) @@ -3170,9 +3232,9 @@ do_create_folder_cb (ModestMailOperation *mail_op, 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)); - + folder_view = GTK_WIDGET(g_object_get_data (G_OBJECT (source_win), + MODEST_MOVE_TO_DIALOG_FOLDER_VIEW)); + /* Select the newly created folder. It could happen that the widget is no longer there (i.e. the window has been destroyed, so we need to check this */ @@ -3612,6 +3674,7 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store, GtkWidget *dialog = gtk_dialog_new_with_buttons (_("mail_ti_password_protected"), NULL, + GTK_DIALOG_MODAL, _("mcen_bd_dialog_ok"), GTK_RESPONSE_ACCEPT, _("mcen_bd_dialog_cancel"), @@ -4379,6 +4442,19 @@ modest_ui_actions_on_details (GtkAction *action, /* Show details of each header */ do_headers_action (win, headers_action_show_details, header_view); } +#ifdef MODEST_TOOLKIT_HILDON2 + } else if (MODEST_IS_HEADER_WINDOW (win)) { + TnyFolder *folder; + GtkWidget *header_view; + + header_view = GTK_WIDGET (modest_header_window_get_header_view (MODEST_HEADER_WINDOW (win))); + folder = modest_header_view_get_folder (MODEST_HEADER_VIEW (header_view)); + if (folder) { + modest_platform_run_folder_details_dialog (GTK_WINDOW (win), + folder); + g_object_unref (folder); + } +#endif } } @@ -4477,13 +4553,7 @@ modest_ui_actions_on_check_names (GtkAction *action, ModestMsgEditWindow *window modest_msg_edit_window_check_names (window, FALSE); } -static void -create_move_to_dialog_on_new_folder(GtkWidget *button, gpointer user_data) -{ - modest_ui_actions_create_folder (gtk_widget_get_toplevel (button), - GTK_WIDGET (user_data)); -} - +#ifndef MODEST_TOOLKIT_HILDON2 /* * This function is used to track changes in the selection of the * folder view that is inside the "move to" dialog to enable/disable @@ -4499,7 +4569,6 @@ on_move_to_dialog_folder_selection_changed (ModestFolderView* self, gpointer user_data) { GtkWidget *dialog = NULL; - GtkWidget *ok_button = NULL, *new_button = NULL; gboolean ok_sensitive = TRUE, new_sensitive = TRUE; gboolean moving_folder = FALSE; gboolean is_local_account = TRUE; @@ -4507,18 +4576,14 @@ on_move_to_dialog_folder_selection_changed (ModestFolderView* self, ModestTnyFolderRules rules; g_return_if_fail (MODEST_IS_FOLDER_VIEW(self)); - + if (!selected) return; - - /* Get the OK button */ + dialog = gtk_widget_get_ancestor (GTK_WIDGET (self), GTK_TYPE_DIALOG); if (!dialog) return; - ok_button = g_object_get_data (G_OBJECT (dialog), MOVE_FOLDER_OK_BUTTON); - new_button = g_object_get_data (G_OBJECT (dialog), MOVE_FOLDER_NEW_BUTTON); - /* check if folder_store is an remote account */ if (TNY_IS_ACCOUNT (folder_store)) { TnyAccount *local_account = NULL; @@ -4574,21 +4639,21 @@ on_move_to_dialog_folder_selection_changed (ModestFolderView* self, /* 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 */ @@ -4629,94 +4694,82 @@ on_move_to_dialog_folder_selection_changed (ModestFolderView* self, } 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); + /* Set sensitivity of the OK and NEW button */ + gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, ok_sensitive); + gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), MODEST_GTK_RESPONSE_NEW_FOLDER, new_sensitive); } +#endif +static void +on_move_to_dialog_response (GtkDialog *dialog, + gint response, + gpointer user_data) +{ + GtkWidget *parent_win, *folder_view; + MoveToInfo *helper = NULL; -#define MODEST_MOVE_TO_DIALOG_FOLDER_VIEW "move-to-dialog-folder-view" + helper = (MoveToInfo *) user_data; -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)); + parent_win = (GtkWidget *) helper->win; + folder_view = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), + MODEST_MOVE_TO_DIALOG_FOLDER_VIEW)); + + switch (response) { + TnyFolderStore *dst_folder; + + case MODEST_GTK_RESPONSE_NEW_FOLDER: + modest_ui_actions_create_folder (GTK_WIDGET (dialog), folder_view); + return; + case GTK_RESPONSE_NONE: + case GTK_RESPONSE_CANCEL: + case GTK_RESPONSE_DELETE_EVENT: + break; + case GTK_RESPONSE_OK: + dst_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); + /* Do window specific stuff */ + if (MODEST_IS_MAIN_WINDOW (parent_win)) { + modest_ui_actions_on_main_window_move_to (NULL, + folder_view, + dst_folder, + MODEST_MAIN_WINDOW (parent_win)); + } else { + /* Moving from headers window in edit mode */ + modest_ui_actions_on_window_move_to (NULL, helper->list, + dst_folder, + MODEST_WINDOW (parent_win)); + } + + if (dst_folder) + g_object_unref (dst_folder); + + break; + default: + g_warning ("%s unexpected response id %d", __FUNCTION__, response); + } + + /* Free the helper and exit */ + g_object_unref (helper->list); + g_slice_free (MoveToInfo, helper); + gtk_widget_destroy (GTK_WIDGET (dialog)); } static GtkWidget* create_move_to_dialog (GtkWindow *win, - GtkWidget *folder_view, - GtkWidget **tree_view) + GtkWidget *folder_view) { - GtkWidget *dialog; -#ifdef MODEST_TOOLKIT_HILDON2 - GtkWidget *pannable; -#else - GtkWidget *scroll; -#endif - GtkWidget *new_button, *ok_button; + GtkWidget *dialog, *tree_view = NULL; - dialog = gtk_dialog_new_with_buttons (_("mcen_ti_moveto_folders_title"), - GTK_WINDOW (win), - GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR | GTK_DIALOG_DESTROY_WITH_PARENT, - NULL); + dialog = modest_platform_create_move_to_dialog (win, &tree_view); -#ifndef MODEST_TOOLKIT_GTK - ok_button = 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 (_("mcen_bd_new")); - gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->action_area), new_button, FALSE, FALSE, 0); - gtk_widget_show (new_button); #ifndef MODEST_TOOLKIT_HILDON2 - gtk_dialog_add_button (GTK_DIALOG (dialog), _("mcen_bd_dialog_cancel"), GTK_RESPONSE_REJECT); -#endif -#else - /* We do this manually so GTK+ does not associate a response ID for - * the button. */ - new_button = gtk_button_new_with_label (_("mcen_ti_new_folder")); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), new_button, FALSE, FALSE, 0); - gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (GTK_DIALOG (dialog)->action_area), new_button, TRUE); - gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT); - ok_button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_OK, GTK_RESPONSE_ACCEPT); - gtk_container_set_border_width (GTK_CONTAINER (dialog), 12); - gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 24); -#endif - g_object_set_data (G_OBJECT (dialog), MOVE_FOLDER_OK_BUTTON, ok_button); - g_object_set_data (G_OBJECT (dialog), MOVE_FOLDER_NEW_BUTTON, new_button); - - /* Create scrolled window */ -#ifdef MODEST_TOOLKIT_HILDON2 - pannable = hildon_pannable_area_new (); -#else - scroll = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); -#endif - -#ifdef MODEST_TOOLKIT_GTK - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scroll), GTK_SHADOW_IN); -#endif - - /* Create folder view */ - *tree_view = modest_platform_create_folder_view (NULL); - /* 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, + 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); +#endif /* It could happen that we're trying to move a message from a window (msg window for example) after the main window was @@ -4725,16 +4778,16 @@ create_move_to_dialog (GtkWindow *win, if (MODEST_IS_FOLDER_VIEW (folder_view)) { const gchar *visible_id = NULL; - modest_folder_view_set_style (MODEST_FOLDER_VIEW (*tree_view), + modest_folder_view_set_style (MODEST_FOLDER_VIEW (tree_view), MODEST_FOLDER_VIEW_STYLE_SHOW_ALL); modest_folder_view_copy_model (MODEST_FOLDER_VIEW(folder_view), - MODEST_FOLDER_VIEW(*tree_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), + modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(tree_view), visible_id); } else { const gchar *active_account_name = NULL; @@ -4742,9 +4795,9 @@ create_move_to_dialog (GtkWindow *win, ModestAccountSettings *settings = NULL; ModestServerAccountSettings *store_settings = NULL; - modest_folder_view_set_style (MODEST_FOLDER_VIEW (*tree_view), + modest_folder_view_set_style (MODEST_FOLDER_VIEW (tree_view), MODEST_FOLDER_VIEW_STYLE_SHOW_ALL); - modest_folder_view_update_model (MODEST_FOLDER_VIEW (*tree_view), + 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)); @@ -4756,47 +4809,30 @@ create_move_to_dialog (GtkWindow *win, store_settings = modest_account_settings_get_store_settings (settings); store_account_name = modest_server_account_settings_get_account_name (store_settings); - modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW (*tree_view), + modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW (tree_view), store_account_name); g_object_unref (store_settings); g_object_unref (settings); } } - /* 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) + /* 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); + 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); - -#ifdef MODEST_TOOLKIT_HILDON2 - gtk_container_add (GTK_CONTAINER (pannable), *tree_view); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), - pannable, TRUE, TRUE, 0); -#else - gtk_container_add (GTK_CONTAINER (scroll), *tree_view); - /* Add scroll to dialog */ - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), - scroll, TRUE, TRUE, 0); + modest_folder_view_show_non_move_folders (MODEST_FOLDER_VIEW (tree_view), FALSE); +#ifndef MODEST_TOOLKIT_HILDON2 + modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (tree_view)); #endif - - gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox)); -#ifndef MODEST_TOOLKIT_GTK - gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 300); -#else - gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 400); -#endif + gtk_widget_show (GTK_WIDGET (tree_view)); return dialog; } - - /* * Shows a confirmation dialog to the user when we're moving messages * from a remote server to the local storage. Returns the dialog @@ -5405,7 +5441,8 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action, src_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); /* Get header view */ - header_view = MODEST_HEADER_VIEW(modest_main_window_get_child_widget (win, MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW)); + header_view = (ModestHeaderView *) + modest_main_window_get_child_widget (win, MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); /* Get folder or messages to transfer */ if (gtk_widget_is_focus (folder_view)) { @@ -5421,7 +5458,7 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action, do_xfer = FALSE; } - if (do_xfer) { + if (do_xfer) { MoveFolderInfo *info = g_new0 (MoveFolderInfo, 1); DoubleConnectionInfo *connect_info = g_slice_new (DoubleConnectionInfo); @@ -5504,44 +5541,45 @@ modest_ui_actions_transfer_messages_helper (GtkWindow *win, * UI handler for the "Move to" action when invoked from the * ModestMsgViewWindow */ -static void -modest_ui_actions_on_msg_view_window_move_to (GtkAction *action, - TnyFolderStore *dst_folder, - ModestMsgViewWindow *win) +static void +modest_ui_actions_on_window_move_to (GtkAction *action, + TnyList *headers, + TnyFolderStore *dst_folder, + ModestWindow *win) { - TnyList *headers = NULL; - TnyHeader *header = NULL; TnyFolder *src_folder = NULL; g_return_if_fail (TNY_IS_FOLDER (dst_folder)); - /* Create header list */ - header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win)); - src_folder = TNY_FOLDER (tny_header_get_folder(header)); - headers = tny_simple_list_new (); - tny_list_append (headers, G_OBJECT (header)); + if (headers) { + TnyHeader *header = NULL; + TnyIterator *iter; + + iter = tny_list_create_iterator (headers); + header = (TnyHeader *) tny_iterator_get_current (iter); + src_folder = tny_header_get_folder (header); - /* Transfer the messages */ - modest_ui_actions_transfer_messages_helper (GTK_WINDOW (win), src_folder, headers, - TNY_FOLDER (dst_folder)); + /* Transfer the messages */ + modest_ui_actions_transfer_messages_helper (GTK_WINDOW (win), src_folder, + headers, + TNY_FOLDER (dst_folder)); - /* Frees */ - g_object_unref (src_folder); - g_object_unref (header); - g_object_unref (headers); + /* Frees */ + g_object_unref (header); + g_object_unref (iter); + g_object_unref (src_folder); + } } void modest_ui_actions_on_move_to (GtkAction *action, ModestWindow *win) { - GtkWidget *dialog = NULL, *folder_view = NULL, *tree_view = NULL; - gint result = 0; - TnyFolderStore *dst_folder = NULL; + GtkWidget *dialog = NULL, *folder_view = NULL; ModestMainWindow *main_window; + MoveToInfo *helper = NULL; - g_return_if_fail (MODEST_IS_MAIN_WINDOW (win) || - MODEST_IS_MSG_VIEW_WINDOW (win)); + g_return_if_fail (MODEST_IS_WINDOW (win)); /* Get the main window if exists */ if (MODEST_IS_MAIN_WINDOW (win)) @@ -5559,31 +5597,21 @@ modest_ui_actions_on_move_to (GtkAction *action, folder_view = NULL; /* Create and run the dialog */ - dialog = create_move_to_dialog (GTK_WINDOW (win), folder_view, &tree_view); - modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (tree_view)); - modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog), (GtkWindow *) win); - result = gtk_dialog_run (GTK_DIALOG(dialog)); - g_object_ref (tree_view); - gtk_widget_destroy (dialog); + dialog = create_move_to_dialog (GTK_WINDOW (win), folder_view); + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), + GTK_WINDOW (dialog), + (GtkWindow *) win); - if (result != GTK_RESPONSE_ACCEPT) - return; + /* Create helper */ + helper = g_slice_new0 (MoveToInfo); + helper->list = modest_platform_get_list_to_move (MODEST_WINDOW (win)); + helper->win = win; - 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)); - } + /* Listen to response signal */ + g_signal_connect (dialog, "response", G_CALLBACK (on_move_to_dialog_response), helper); - if (dst_folder) - g_object_unref (dst_folder); + /* Show the dialog */ + gtk_widget_show (dialog); } /* @@ -6173,6 +6201,24 @@ modest_ui_actions_get_msg_already_deleted_error_msg (ModestWindow *win) folder = TNY_FOLDER_STORE (tny_header_get_folder (header)); g_object_unref (iter); g_object_unref (headers); +#ifdef MODEST_TOOLKIT_HILDON2 + } else if (MODEST_IS_HEADER_WINDOW (win)) { + GtkWidget *header_view; + TnyList* headers = NULL; + TnyIterator *iter; + header_view = GTK_WIDGET (modest_header_window_get_header_view (MODEST_HEADER_WINDOW (win))); + headers = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (header_view)); + if (!headers || tny_list_get_length (headers) == 0) { + if (headers) + g_object_unref (headers); + return NULL; + } + iter = tny_list_create_iterator (headers); + header = TNY_HEADER (tny_iterator_get_current (iter)); + folder = TNY_FOLDER_STORE (tny_header_get_folder (header)); + g_object_unref (iter); + g_object_unref (headers); +#endif } else if (MODEST_IS_MSG_VIEW_WINDOW (win)) { header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win)); folder = TNY_FOLDER_STORE (tny_header_get_folder (header));