X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=d7d3d7a0c00756cd6a9bead6827d0773f7a53ceb;hp=c478462feb7f9ec3247919ddf9027bcfcd7209ad;hb=10135c887c0c30ddefa85716b06d3e5795a17651;hpb=6afea9b226717688cb136ee4b1c00b0c6bb11e4e diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index c478462..d7d3d7a 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -813,6 +813,13 @@ typedef struct { GtkWidget *banner; } OpenMsgBannerInfo; +typedef struct { + GtkTreeModel *model; + TnyList *headers; + OpenMsgBannerInfo *banner_info; + GHashTable *row_refs_per_header; +} OpenMsgHelper; + gboolean open_msg_banner_idle (gpointer userdata) { @@ -844,13 +851,13 @@ open_msg_cb (ModestMailOperation *mail_op, gchar *account = NULL; TnyFolder *folder; gboolean open_in_editor = FALSE; - OpenMsgBannerInfo *banner_info = (OpenMsgBannerInfo *) user_data; + 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)) - goto banner_cleanup; + return; parent_win = (ModestWindow *) modest_mail_operation_get_source (mail_op); folder = tny_header_get_folder (header); @@ -936,31 +943,12 @@ open_msg_cb (ModestMailOperation *mail_op, gchar *uid = modest_tny_folder_get_header_unique_id (header); if (MODEST_IS_MAIN_WINDOW (parent_win)) { - GtkWidget *header_view; - GtkTreeSelection *sel; - GList *sel_list = NULL; - GtkTreeModel *model; - - header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(parent_win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); - - sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (header_view)); - sel_list = gtk_tree_selection_get_selected_rows (sel, &model); + GtkTreeRowReference *row_reference; - if (sel_list != NULL) { - GtkTreeRowReference *row_reference; - - row_reference = gtk_tree_row_reference_new (model, (GtkTreePath *) sel_list->data); - g_list_foreach (sel_list, (GFunc) gtk_tree_path_free, NULL); - g_list_free (sel_list); + row_reference = (GtkTreeRowReference *) g_hash_table_lookup (helper->row_refs_per_header, header); - 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_for_attachment (msg, account, (const gchar*) uid); - } + win = modest_msg_view_window_new_with_header_model (msg, account, (const gchar*) uid, + helper->model, row_reference); } else { win = modest_msg_view_window_new_for_attachment (msg, account, (const gchar*) uid); } @@ -985,25 +973,11 @@ cleanup: g_free(account); g_object_unref (parent_win); g_object_unref (folder); -banner_cleanup: - if (banner_info) { - g_free (banner_info->message); - if (banner_info->idle_handler > 0) { - g_source_remove (banner_info->idle_handler); - banner_info->idle_handler = 0; - } - if (banner_info->banner != NULL) { - gtk_widget_destroy (banner_info->banner); - g_object_unref (banner_info->banner); - banner_info->banner = NULL; - } - g_slice_free (OpenMsgBannerInfo, banner_info); - } } void -modest_ui_actions_get_msgs_full_error_handler (ModestMailOperation *mail_op, - gpointer user_data) +modest_ui_actions_disk_operations_error_handler (ModestMailOperation *mail_op, + gpointer user_data) { const GError *error; GObject *win = NULL; @@ -1083,6 +1057,31 @@ foreach_unregister_headers (gpointer data, } static void +open_msgs_helper_destroyer (gpointer user_data) +{ + OpenMsgHelper *helper = (OpenMsgHelper *) user_data; + + if (helper->banner_info) { + g_free (helper->banner_info->message); + if (helper->banner_info->idle_handler > 0) { + g_source_remove (helper->banner_info->idle_handler); + helper->banner_info->idle_handler = 0; + } + if (helper->banner_info->banner != NULL) { + gtk_widget_destroy (helper->banner_info->banner); + g_object_unref (helper->banner_info->banner); + helper->banner_info->banner = NULL; + } + g_slice_free (OpenMsgBannerInfo, helper->banner_info); + helper->banner_info = NULL; + } + g_object_unref (helper->model); + g_object_unref (helper->headers); + g_hash_table_destroy (helper->row_refs_per_header); + g_slice_free (OpenMsgHelper, helper); +} + +static void open_msgs_performer(gboolean canceled, GError *err, GtkWindow *parent_window, @@ -1096,15 +1095,18 @@ open_msgs_performer(gboolean canceled, TnyList *not_opened_headers; TnyConnectionStatus status; gboolean show_open_draft = FALSE; - OpenMsgBannerInfo *banner_info = NULL; + OpenMsgHelper *helper = NULL; - not_opened_headers = TNY_LIST (user_data); + 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 ()); + /* Free the helper */ + open_msgs_helper_destroyer (helper); goto clean; } @@ -1150,29 +1152,29 @@ open_msgs_performer(gboolean canceled, /* Create the mail operation */ mail_op = modest_mail_operation_new_with_error_handling ((GObject *) parent_window, - modest_ui_actions_get_msgs_full_error_handler, + modest_ui_actions_disk_operations_error_handler, error_msg, g_free); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); if (show_open_draft) { - banner_info = g_slice_new (OpenMsgBannerInfo); - banner_info->message = g_strdup (_("mail_ib_opening_draft_message")); - banner_info->banner = NULL; - banner_info->idle_handler = g_timeout_add (500, open_msg_banner_idle, banner_info); + helper->banner_info = g_slice_new (OpenMsgBannerInfo); + helper->banner_info->message = g_strdup (_("mail_ib_opening_draft_message")); + helper->banner_info->banner = NULL; + helper->banner_info->idle_handler = g_timeout_add (500, open_msg_banner_idle, + helper->banner_info); } modest_mail_operation_get_msgs_full (mail_op, not_opened_headers, open_msg_cb, - banner_info, - NULL); + helper, + open_msgs_helper_destroyer); /* Frees */ clean: if (mail_op) g_object_unref (mail_op); - g_object_unref (not_opened_headers); g_object_unref (account); } @@ -1190,6 +1192,12 @@ open_msgs_from_headers (TnyList *headers, ModestWindow *win) TnyHeaderFlags flags = 0; TnyAccount *account; gint uncached_msgs = 0; + GtkWidget *header_view; + GtkTreeModel *model; + GHashTable *refs_for_headers; + OpenMsgHelper *helper; + GtkTreeSelection *sel; + GList *sel_list = NULL, *sel_list_iter = NULL; g_return_if_fail (headers != NULL); @@ -1209,11 +1217,23 @@ open_msgs_from_headers (TnyList *headers, ModestWindow *win) 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)) { + while (!tny_iterator_is_done (iter) && sel_list_iter) { ModestWindow *window = NULL; TnyHeader *header = NULL; @@ -1229,27 +1249,39 @@ open_msgs_from_headers (TnyList *headers, ModestWindow *win) /* Do not open again the message and present the window to the user */ if (found) { - if (window) + if (window) { gtk_window_present (GTK_WINDOW (window)); - else + } 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); } if (header) g_object_unref (header); + /* Go to next */ tny_iterator_next (iter); + sel_list_iter = g_list_next (sel_list_iter); } 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) + 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) @@ -1270,8 +1302,10 @@ open_msgs_from_headers (TnyList *headers, ModestWindow *win) uncached_msgs)); /* End if the user does not want to continue */ - if (response == GTK_RESPONSE_CANCEL) + if (response == GTK_RESPONSE_CANCEL) { + g_hash_table_destroy (refs_for_headers); goto cleanup; + } } } } @@ -1289,14 +1323,23 @@ open_msgs_from_headers (TnyList *headers, ModestWindow *win) g_object_unref (iter_not_opened); iter_not_opened = 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->banner_info = NULL; + /* Connect to the account and perform */ if (uncached_msgs > 0) { modest_platform_connect_and_perform ((GtkWindow *) win, TRUE, g_object_ref (account), - open_msgs_performer, g_object_ref (not_opened_headers)); + open_msgs_performer, helper); } else { /* Call directly the performer, do not need to connect */ - open_msgs_performer (FALSE, NULL, (GtkWindow *) win, g_object_ref (account), - g_object_ref (not_opened_headers)); + open_msgs_performer (FALSE, NULL, (GtkWindow *) win, + g_object_ref (account), helper); } cleanup: /* Clean */ @@ -1591,7 +1634,7 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) if (do_retrieve) { mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(win), - modest_ui_actions_get_msgs_full_error_handler, + modest_ui_actions_disk_operations_error_handler, NULL, NULL); modest_mail_operation_queue_add ( modest_runtime_get_mail_operation_queue (), mail_op); @@ -1758,6 +1801,7 @@ typedef struct { ModestWindow *win; gchar *account_name; gboolean poke_status; + gboolean interactive; } SendReceiveInfo; static void @@ -1792,7 +1836,7 @@ do_send_receive_performer (gboolean canceled, /* Send & receive. */ modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); - modest_mail_operation_update_account (mail_op, info->account_name, info->poke_status, + modest_mail_operation_update_account (mail_op, info->account_name, info->poke_status, info->interactive, (info->win) ? retrieve_all_messages_cb : NULL, new_messages_arrived, info->win); g_object_unref (G_OBJECT (mail_op)); @@ -1818,6 +1862,7 @@ void modest_ui_actions_do_send_receive (const gchar *account_name, gboolean force_connection, gboolean poke_status, + gboolean interactive, ModestWindow *win) { gchar *acc_name = NULL; @@ -1846,6 +1891,7 @@ modest_ui_actions_do_send_receive (const gchar *account_name, info->account_name = acc_name; info->win = (win) ? g_object_ref (win) : NULL; info->poke_status = poke_status; + info->interactive = interactive; info->account = modest_tny_account_store_get_server_account (acc_store, acc_name, TNY_ACCOUNT_TYPE_STORE); @@ -1935,7 +1981,8 @@ modest_ui_actions_cancel_send (GtkAction *action, ModestWindow *win) void modest_ui_actions_do_send_receive_all (ModestWindow *win, gboolean force_connection, - gboolean poke_status) + gboolean poke_status, + gboolean interactive) { GSList *account_names, *iter; @@ -1946,7 +1993,7 @@ modest_ui_actions_do_send_receive_all (ModestWindow *win, while (iter) { modest_ui_actions_do_send_receive ((const char*) iter->data, force_connection, - poke_status, win); + poke_status, interactive, win); iter = g_slist_next (iter); } @@ -1989,7 +2036,7 @@ modest_ui_actions_on_send_receive (GtkAction *action, ModestWindow *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, win); + modest_ui_actions_do_send_receive (NULL, TRUE, TRUE, TRUE, win); } @@ -2330,15 +2377,10 @@ on_save_to_drafts_cb (ModestMailOperation *mail_op, edit_window = MODEST_MSG_EDIT_WINDOW (user_data); - /* It might not be a good idea to do nothing if there was an error, - * so let's at least show a generic error banner. */ - /* TODO error while saving attachment, show "Saving draft failed" banner */ - if (modest_mail_operation_get_error (mail_op) != NULL) { - g_warning ("%s failed: %s\n", __FUNCTION__, (modest_mail_operation_get_error (mail_op))->message); - modest_platform_information_banner (NULL, NULL, _("mail_ib_file_operation_failed")); - } else { + /* Set draft is there was no error */ + if (!modest_mail_operation_get_error (mail_op)) modest_msg_edit_window_set_draft (edit_window, saved_draft); - } + g_object_unref(edit_window); } @@ -2406,7 +2448,8 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi from = modest_account_mgr_get_from_string (account_mgr, account_name); /* Create the mail operation */ - mail_operation = modest_mail_operation_new (NULL); + mail_operation = modest_mail_operation_new_with_error_handling (NULL, modest_ui_actions_disk_operations_error_handler, + NULL, NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_operation); modest_mail_operation_save_to_drafts (mail_operation, @@ -2753,11 +2796,20 @@ do_create_folder_cb (ModestMailOperation *mail_op, GtkWindow *source_win = (GtkWindow *) modest_mail_operation_get_source (mail_op); if (modest_mail_operation_get_error (mail_op)) { - /* Show an error */ - modest_platform_information_banner (GTK_WIDGET (source_win), NULL, - _("mail_in_ui_folder_create_error")); - /* Try again */ + /* Show an error. If there was some problem writing to + disk, show it, otherwise show the generic folder + create error. We do it here and not in an error + handler because the call to do_create_folder will + stop the main loop in a gtk_dialog_run and then, + the message won't be shown until that dialog is + closed */ + modest_ui_actions_disk_operations_error_handler (mail_op, + _("mail_in_ui_folder_create_error")); + + /* Try again. Do *NOT* show any error because the mail + operations system will do it for us because we + created the mail_op with new_with_error_handler */ do_create_folder (source_win, parent_folder, (const gchar *) suggested_name); } else { /* the 'source_win' is either the ModestMainWindow, or the 'Move to folder'-dialog @@ -2798,8 +2850,7 @@ do_create_folder (GtkWindow *parent_window, if (result == GTK_RESPONSE_ACCEPT) { ModestMailOperation *mail_op; - mail_op = modest_mail_operation_new (G_OBJECT(parent_window)); - + mail_op = modest_mail_operation_new (NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); modest_mail_operation_create_folder (mail_op, @@ -2868,7 +2919,6 @@ static void modest_ui_actions_rename_folder_error_handler (ModestMailOperation *mail_op, gpointer user_data) { - ModestMainWindow *window = MODEST_MAIN_WINDOW (user_data); const GError *error = NULL; const gchar *message = NULL; @@ -2882,12 +2932,12 @@ modest_ui_actions_rename_folder_error_handler (ModestMailOperation *mail_op, message = _CS("ckdg_ib_folder_already_exists"); break; default: - g_warning ("%s: BUG: unexpected error:[%d]: %s", __FUNCTION__, - error->code, error->message); - return; + message = _("emev_ib_ui_imap_unable_to_rename"); } - modest_platform_information_banner (GTK_WIDGET (window), NULL, message); + /* We don't set a parent for the dialog because the dialog + will be destroyed so the banner won't appear */ + modest_platform_information_banner (NULL, NULL, message); } typedef struct { @@ -2900,9 +2950,15 @@ on_rename_folder_cb (ModestMailOperation *mail_op, TnyFolder *new_folder, gpointer user_data) { - /* Select now */ - modest_folder_view_select_folder (MODEST_FOLDER_VIEW (user_data), - new_folder, FALSE); + ModestFolderView *folder_view; + + folder_view = MODEST_FOLDER_VIEW (user_data); + /* Note that if the rename fails new_folder will be NULL */ + if (new_folder) { + modest_folder_view_select_folder (folder_view, new_folder, FALSE); + } else { + modest_folder_view_select_first_inbox_or_local (folder_view); + } } static void @@ -3296,8 +3352,8 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store, if (cancel) *cancel = FALSE; } else { - modest_platform_information_banner(GTK_WIDGET (dialog), - NULL, _("mail_ib_login_cancelled")); + /* Set parent to NULL or the banner will disappear with its parent dialog */ + modest_platform_information_banner(NULL, NULL, _("mail_ib_login_cancelled")); completed = TRUE; if (username) *username = NULL; @@ -4629,7 +4685,7 @@ modest_ui_actions_on_main_window_remove_attachments (GtkAction *action, ModestMailOperation *mail_op = NULL; modest_window_mgr_register_header (modest_runtime_get_window_mgr (), header, NULL); mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT (win), - modest_ui_actions_get_msgs_full_error_handler, + modest_ui_actions_disk_operations_error_handler, NULL, NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); modest_mail_operation_get_msg (mail_op, header, open_msg_for_purge_cb, win); @@ -5214,7 +5270,7 @@ retrieve_msg_contents_performer (gboolean canceled, /* Create mail operation */ mail_op = modest_mail_operation_new_with_error_handling ((GObject *) parent_window, - modest_ui_actions_get_msgs_full_error_handler, + modest_ui_actions_disk_operations_error_handler, NULL, NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); modest_mail_operation_get_msgs_full (mail_op, headers, NULL, NULL, NULL); @@ -5459,21 +5515,20 @@ modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self, TnyTransportAccount *server_account; gchar *message = NULL; - /* Don't show anything if the user cancelled something */ - if (err->code == TNY_SYSTEM_ERROR_CANCEL) + /* Don't show anything if the user cancelled something or the send receive request is not + * interactive */ + if (err->code == TNY_SYSTEM_ERROR_CANCEL || + !modest_tny_send_queue_get_requested_send_receive (MODEST_TNY_SEND_QUEUE (self))) return; + /* Get the server name: */ server_account = TNY_TRANSPORT_ACCOUNT (tny_camel_send_queue_get_transport_account (TNY_CAMEL_SEND_QUEUE (self))); - if (server_account) { - server_name = tny_account_get_hostname (TNY_ACCOUNT (server_account)); - - g_object_unref (server_account); - server_account = NULL; - } - - g_return_if_fail (server_name); + if (server_account) + server_name = tny_account_get_hostname (TNY_ACCOUNT (server_account)); + else + g_return_if_reached (); /* Show the appropriate message text for the GError: */ switch (err->code) { @@ -5502,6 +5557,7 @@ modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self, modest_platform_run_information_dialog (NULL, message); g_free (message); + g_object_unref (server_account); } void