X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=6c9824eee8cc5b3c390005e8d245423b40d1a05f;hp=d4c6622dfc5aaf1eff03e1d963d529e593851b87;hb=c5c7a9164713055c43ec69bdda8c2767271515a1;hpb=2b6c4fa7f90c2e9e24627eba531e3f03f7a6391f diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index d4c6622..6c9824e 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -102,6 +102,7 @@ typedef struct _ReplyForwardHelper { ReplyForwardAction action; gchar *account_name; GtkWidget *parent_window; + TnyHeader *header; } ReplyForwardHelper; typedef struct _MoveToHelper { @@ -526,7 +527,7 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) if (prev_row_reference != NULL) gtk_tree_row_reference_free (prev_row_reference); if (prev_path != NULL) - gtk_tree_path_free (prev_path); + gtk_tree_path_free (prev_path); } /* Update toolbar dimming state */ @@ -648,7 +649,6 @@ modest_ui_actions_on_accounts (GtkAction *action, } else { /* Show the list of accounts */ GtkWindow *account_win = GTK_WINDOW (modest_account_view_window_new ()); - gtk_window_set_transient_for (account_win, GTK_WINDOW (win)); /* The accounts dialog must be modal */ modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), account_win); @@ -656,18 +656,6 @@ modest_ui_actions_on_accounts (GtkAction *action, } } -#ifdef MODEST_PLATFORM_MAEMO -static void -on_smtp_servers_window_hide (GtkWindow* window, gpointer user_data) -{ - /* Save any changes. */ - modest_connection_specific_smtp_window_save_server_accounts ( - MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (window)); - gtk_widget_destroy (GTK_WIDGET (window)); -} -#endif - - void modest_ui_actions_on_smtp_servers (GtkAction *action, ModestWindow *win) { @@ -683,14 +671,10 @@ modest_ui_actions_on_smtp_servers (GtkAction *action, ModestWindow *win) MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (specific_window), modest_runtime_get_account_mgr()); - /* Show the window: */ - gtk_window_set_transient_for (GTK_WINDOW (specific_window), GTK_WINDOW (win)); - gtk_window_set_modal (GTK_WINDOW (specific_window), TRUE); + /* Show the window: */ + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), + GTK_WINDOW (specific_window)); gtk_widget_show (specific_window); - - /* Save changes when the window is hidden: */ - g_signal_connect (specific_window, "hide", - G_CALLBACK (on_smtp_servers_window_hide), win); #endif /* MODEST_PLATFORM_MAEMO */ } @@ -718,7 +702,7 @@ modest_ui_actions_compose_msg(ModestWindow *win, /* we check for low-mem; in that case, show a warning, and don't allow * composing a message with attachments */ - if (attachments && modest_platform_check_memory_low (win)) + if (attachments && modest_platform_check_memory_low (win, TRUE)) goto cleanup; account_name = modest_account_mgr_get_default_account(mgr); @@ -817,6 +801,18 @@ modest_ui_actions_msg_retrieval_check (ModestMailOperation *mail_op, /* If there is no message or the operation was not successful */ status = modest_mail_operation_get_status (mail_op); if (!msg || status != MODEST_MAIL_OPERATION_STATUS_SUCCESS) { + const GError *error; + + /* If it's a memory low issue, then show a banner */ + error = modest_mail_operation_get_error (mail_op); + if (error && error->domain == MODEST_MAIL_OPERATION_ERROR && + error->code == MODEST_MAIL_OPERATION_ERROR_LOW_MEMORY) { + GObject *source = modest_mail_operation_get_source (mail_op); + modest_platform_run_information_dialog (GTK_IS_WINDOW (source) ? GTK_WINDOW (source) : NULL, + dgettext("ke-recv","memr_ib_operation_disabled"), + TRUE); + g_object_unref (source); + } /* Remove the header from the preregistered uids */ modest_window_mgr_unregister_header (modest_runtime_get_window_mgr (), @@ -849,7 +845,8 @@ open_msg_banner_idle (gpointer userdata) gdk_threads_enter (); banner_info->idle_handler = 0; banner_info->banner = modest_platform_animation_banner (NULL, NULL, banner_info->message); - g_object_ref (banner_info->banner); + if (banner_info) + g_object_ref (banner_info->banner); gdk_threads_leave (); @@ -945,17 +942,19 @@ open_msg_cb (ModestMailOperation *mail_op, if (from_header) { GSList *accounts = modest_account_mgr_account_names (mgr, TRUE); GSList *node = NULL; + for (node = accounts; node != NULL; node = g_slist_next (node)) { gchar *from = modest_account_mgr_get_from_string (mgr, node->data); - + if (from && (strcmp (from_header, from) == 0)) { g_free (account); account = g_strdup (node->data); g_free (from); break; - } + } g_free (from); - } + } + g_free (from_header); g_slist_foreach (accounts, (GFunc) g_free, NULL); g_slist_free (accounts); @@ -1406,7 +1405,7 @@ modest_ui_actions_on_open (GtkAction *action, ModestWindow *win) /* we check for low-mem; in that case, show a warning, and don't allow * opening */ - if (modest_platform_check_memory_low (MODEST_WINDOW(win))) + if (modest_platform_check_memory_low (MODEST_WINDOW(win), TRUE)) return; /* Get headers */ @@ -1420,6 +1419,26 @@ modest_ui_actions_on_open (GtkAction *action, ModestWindow *win) g_object_unref(headers); } +static ReplyForwardHelper* +create_reply_forward_helper (ReplyForwardAction action, + ModestWindow *win, + guint reply_forward_type, + TnyHeader *header) +{ + ReplyForwardHelper *rf_helper = NULL; + const gchar *active_acc = modest_window_get_active_account (win); + + rf_helper = g_slice_new0 (ReplyForwardHelper); + rf_helper->reply_forward_type = reply_forward_type; + rf_helper->action = action; + rf_helper->parent_window = (MODEST_IS_WINDOW (win)) ? GTK_WIDGET (win) : NULL; + rf_helper->header = (header) ? g_object_ref (header) : NULL; + rf_helper->account_name = (active_acc) ? + g_strdup (active_acc) : + modest_account_mgr_get_default_account (modest_runtime_get_account_mgr()); + + return rf_helper; +} static void free_reply_forward_helper (gpointer data) @@ -1428,6 +1447,8 @@ free_reply_forward_helper (gpointer data) helper = (ReplyForwardHelper *) data; g_free (helper->account_name); + if (helper->header) + g_object_unref (helper->header); g_slice_free (ReplyForwardHelper, helper); } @@ -1439,7 +1460,7 @@ reply_forward_cb (ModestMailOperation *mail_op, GError *err, gpointer user_data) { - TnyMsg *new_msg; + TnyMsg *new_msg = NULL; ReplyForwardHelper *rf_helper; ModestWindow *msg_win = NULL; ModestEditType edit_type; @@ -1452,11 +1473,9 @@ reply_forward_cb (ModestMailOperation *mail_op, /* If there was any error. The mail operation could be NULL, this means that we already have the message downloaded and that we didn't do a mail operation to retrieve it */ - if (mail_op && !modest_ui_actions_msg_retrieval_check (mail_op, header, msg)) - return; - - g_return_if_fail (user_data != NULL); rf_helper = (ReplyForwardHelper *) user_data; + if (mail_op && !modest_ui_actions_msg_retrieval_check (mail_op, header, msg)) + goto cleanup; from = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(), rf_helper->account_name); @@ -1492,10 +1511,11 @@ reply_forward_cb (ModestMailOperation *mail_op, return; } + g_free (from); g_free (signature); if (!new_msg) { - g_printerr ("modest: failed to create message\n"); + g_warning ("%s: failed to create message\n", __FUNCTION__); goto cleanup; } @@ -1503,7 +1523,7 @@ reply_forward_cb (ModestMailOperation *mail_op, rf_helper->account_name, TNY_ACCOUNT_TYPE_STORE); if (!account) { - g_printerr ("modest: failed to get tnyaccount for '%s'\n", rf_helper->account_name); + g_warning ("%s: failed to get tnyaccount for '%s'\n", __FUNCTION__, rf_helper->account_name); goto cleanup; } @@ -1529,7 +1549,6 @@ cleanup: g_object_unref (G_OBJECT (new_msg)); if (account) g_object_unref (G_OBJECT (account)); -/* g_object_unref (msg); */ free_reply_forward_helper (rf_helper); } @@ -1586,25 +1605,48 @@ connect_to_get_msg (ModestWindow *win, return modest_platform_connect_and_wait((GtkWindow *) win, account); } +static void +reply_forward_performer (gboolean canceled, + GError *err, + GtkWindow *parent_window, + TnyAccount *account, + gpointer user_data) +{ + ReplyForwardHelper *rf_helper = NULL; + ModestMailOperation *mail_op; + + rf_helper = (ReplyForwardHelper *) user_data; + + if (canceled || err) { + free_reply_forward_helper (rf_helper); + return; + } + + /* Retrieve the message */ + mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT (parent_window), + 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, rf_helper->header, TRUE, reply_forward_cb, rf_helper); + + /* Frees */ + g_object_unref(mail_op); +} + /* * Common code for the reply and forward actions */ static void reply_forward (ReplyForwardAction action, ModestWindow *win) { - ModestMailOperation *mail_op = NULL; - TnyList *header_list = NULL; ReplyForwardHelper *rf_helper = NULL; guint reply_forward_type; - gboolean continue_download = TRUE; - gboolean do_retrieve = TRUE; 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))) + if (modest_platform_check_memory_low (MODEST_WINDOW(win), TRUE)) return; @@ -1614,113 +1656,115 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) return; } - header_list = get_selected_headers (win); - if (!header_list) - return; - - reply_forward_type = + reply_forward_type = modest_conf_get_int (modest_runtime_get_conf (), - (action == ACTION_FORWARD) ? MODEST_CONF_FORWARD_TYPE : MODEST_CONF_REPLY_TYPE, + (action == ACTION_FORWARD) ? + MODEST_CONF_FORWARD_TYPE : + MODEST_CONF_REPLY_TYPE, NULL); - /* 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) { - TnyAccount *account = get_account_from_header_list (header_list); - if (account) { - continue_download = connect_to_get_msg (win, num_of_unc_msgs, account); - g_object_unref (account); - } - } - } - - if (!continue_download) { - g_object_unref (header_list); - return; - } - - /* We assume that we can only select messages of the - same folder and that we reply all of them from the - same account. In fact the interface currently only - allows single selection */ - - /* Fill helpers */ - rf_helper = g_slice_new0 (ReplyForwardHelper); - rf_helper->reply_forward_type = reply_forward_type; - rf_helper->action = action; - rf_helper->account_name = g_strdup (modest_window_get_active_account (win)); - - if ((win != NULL) && (MODEST_IS_WINDOW (win))) - rf_helper->parent_window = GTK_WIDGET (win); - if (!rf_helper->account_name) - rf_helper->account_name = - modest_account_mgr_get_default_account (modest_runtime_get_account_mgr()); - - if (MODEST_IS_MSG_VIEW_WINDOW(win)) { - TnyMsg *msg; - TnyHeader *header; + if (MODEST_IS_MSG_VIEW_WINDOW (win)) { + TnyMsg *msg = NULL; + TnyHeader *header = NULL; /* Get header and message. Do not free them here, the reply_forward_cb must do it */ msg = modest_msg_view_window_get_message (MODEST_MSG_VIEW_WINDOW(win)); - header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW(win)); - if (!msg || !header) { - if (msg) - g_object_unref (msg); - g_printerr ("modest: no message found\n"); - return; - } else { + header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win)); + + if (msg && header) { + /* Create helper */ + 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 (header) + + if (msg) + g_object_unref (msg); + if (header) g_object_unref (header); } else { - TnyHeader *header; + TnyHeader *header = NULL; TnyIterator *iter; + gboolean do_retrieve = TRUE; + TnyList *header_list = NULL; + + header_list = get_selected_headers (win); + if (!header_list) + return; + if (tny_list_get_length (header_list) == 0) { + g_object_unref (header_list); + return; + } /* Only reply/forward to one message */ iter = tny_list_create_iterator (header_list); header = TNY_HEADER (tny_iterator_get_current (iter)); g_object_unref (iter); - if (header) { - /* Retrieve messages */ - if (do_retrieve) { - mail_op = - modest_mail_operation_new_with_error_handling (G_OBJECT(win), - 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, - reply_forward_cb, - rf_helper); - /* Clean */ - g_object_unref(mail_op); - } else { - /* we put a ref here to prevent double unref as the reply - * forward callback unrefs the header at its end */ - reply_forward_cb (NULL, header, FALSE, NULL, NULL, rf_helper); - } + /* Retrieve messages */ + do_retrieve = (action == ACTION_FORWARD) || + (reply_forward_type != MODEST_TNY_MSG_REPLY_TYPE_CITE); + if (do_retrieve) { + TnyAccount *account = NULL; + TnyFolder *folder = NULL; + gdouble download = TRUE; + guint uncached_msgs = 0; - g_object_unref (header); + folder = tny_header_get_folder (header); + if (!folder) + goto do_retrieve_frees; + account = tny_folder_get_account (folder); + if (!account) + goto do_retrieve_frees; + + uncached_msgs = header_list_count_uncached_msgs (header_list); + + 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) + download = FALSE; + } + } + + if (download) { + /* Create helper */ + rf_helper = create_reply_forward_helper (action, win, + reply_forward_type, header); + if (uncached_msgs > 0) { + modest_platform_connect_and_perform (GTK_WINDOW (win), + TRUE, account, + reply_forward_performer, + rf_helper); + } else { + reply_forward_performer (FALSE, NULL, GTK_WINDOW (win), + account, rf_helper); + } + } + do_retrieve_frees: + if (account) + g_object_unref (account); + if (folder) + g_object_unref (folder); + } else { + reply_forward_cb (NULL, header, FALSE, NULL, NULL, rf_helper); } - + /* Frees */ + g_object_unref (header_list); + g_object_unref (header); } - - /* Free */ - g_object_unref (header_list); } void @@ -2189,6 +2233,7 @@ modest_ui_actions_on_header_activated (ModestHeaderView *header_view, ModestMainWindow *main_window) { TnyList *headers; + GtkWidget *open_widget; g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window)); @@ -2203,9 +2248,13 @@ 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))) + if (modest_platform_check_memory_low (MODEST_WINDOW(main_window), TRUE)) return; + modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (main_window)); + open_widget = modest_window_get_action_widget (MODEST_WINDOW (main_window), "/MenuBar/EmailMenu/EmailOpenMenu"); + if (!GTK_WIDGET_IS_SENSITIVE (open_widget)) + return; /* headers = tny_simple_list_new (); */ /* tny_list_prepend (headers, G_OBJECT (header)); */ @@ -2254,10 +2303,22 @@ folder_refreshed_cb (ModestMailOperation *mail_op, { ModestMainWindow *win = NULL; GtkWidget *header_view; + const GError *error; g_return_if_fail (TNY_IS_FOLDER (folder)); win = MODEST_MAIN_WINDOW (user_data); + + /* Check if the operation failed due to memory low conditions */ + error = modest_mail_operation_get_error (mail_op); + if (error && error->domain == MODEST_MAIL_OPERATION_ERROR && + error->code == MODEST_MAIL_OPERATION_ERROR_LOW_MEMORY) { + modest_platform_run_information_dialog (GTK_WINDOW (win), + dgettext("ke-recv","memr_ib_operation_disabled"), + TRUE); + return; + } + header_view = modest_main_window_get_child_widget(win, MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); @@ -2436,7 +2497,7 @@ modest_ui_actions_on_msg_attachment_clicked (ModestMsgView *msgview, TnyMimePart /* we check for low-mem; in that case, show a warning, and don't allow * viewing attachments */ - if (modest_platform_check_memory_low (MODEST_WINDOW(win))) + if (modest_platform_check_memory_low (MODEST_WINDOW(win), TRUE)) return; modest_msg_view_window_view_attachment (MODEST_MSG_VIEW_WINDOW (win), mime_part); @@ -2520,7 +2581,7 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi */ if (expected_size > MODEST_MAX_LOW_MEMORY_MESSAGE_SIZE) { - if (modest_platform_check_memory_low (MODEST_WINDOW(edit_window))) { + if (modest_platform_check_memory_low (MODEST_WINDOW(edit_window), TRUE)) { modest_msg_edit_window_free_msg_data (edit_window, data); return FALSE; } @@ -2690,7 +2751,7 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) * this should still allow for sending anything critical... */ if (expected_size > MODEST_MAX_LOW_MEMORY_MESSAGE_SIZE) { - if (modest_platform_check_memory_low (MODEST_WINDOW(edit_window))) { + if (modest_platform_check_memory_low (MODEST_WINDOW(edit_window), TRUE)) { modest_msg_edit_window_free_msg_data (edit_window, data); return FALSE; } @@ -2912,7 +2973,7 @@ modest_ui_actions_on_insert_image (GtkAction *action, g_return_if_fail (GTK_IS_ACTION (action)); - if (modest_platform_check_memory_low (MODEST_WINDOW(window))) + if (modest_platform_check_memory_low (MODEST_WINDOW(window), TRUE)) return; if (modest_msg_edit_window_get_format (MODEST_MSG_EDIT_WINDOW(window)) == MODEST_MSG_EDIT_FORMAT_TEXT) @@ -2928,7 +2989,7 @@ modest_ui_actions_on_attach_file (GtkAction *action, g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window)); g_return_if_fail (GTK_IS_ACTION (action)); - if (modest_platform_check_memory_low (MODEST_WINDOW(window))) + if (modest_platform_check_memory_low (MODEST_WINDOW(window), TRUE)) return; modest_msg_edit_window_offer_attach_file (window); @@ -3121,7 +3182,7 @@ on_rename_folder_cb (ModestMailOperation *mail_op, /* If the window was closed when renaming a folder this could happen */ - if (MODEST_IS_FOLDER_VIEW (user_data)) + if (!MODEST_IS_FOLDER_VIEW (user_data)) return; folder_view = MODEST_FOLDER_VIEW (user_data); @@ -3131,6 +3192,7 @@ on_rename_folder_cb (ModestMailOperation *mail_op, } else { modest_folder_view_select_first_inbox_or_local (folder_view); } + gtk_widget_grab_focus (GTK_WIDGET (folder_view)); } static void @@ -3363,6 +3425,30 @@ modest_ui_actions_on_move_folder_to_trash_folder (GtkAction *action, ModestMainW } +typedef struct _PasswordDialogFields { + GtkWidget *username; + GtkWidget *password; + GtkWidget *dialog; +} PasswordDialogFields; + +static void +password_dialog_check_field (GtkEditable *editable, + PasswordDialogFields *fields) +{ + const gchar *value; + gboolean any_value_empty = FALSE; + + value = gtk_entry_get_text (GTK_ENTRY (fields->username)); + if ((value == NULL) || value[0] == '\0') { + any_value_empty = TRUE; + } + value = gtk_entry_get_text (GTK_ENTRY (fields->password)); + if ((value == NULL) || value[0] == '\0') { + any_value_empty = TRUE; + } + gtk_dialog_set_response_sensitive (GTK_DIALOG (fields->dialog), GTK_RESPONSE_ACCEPT, !any_value_empty); +} + void modest_ui_actions_on_password_requested (TnyAccountStore *account_store, const gchar* server_account_name, @@ -3374,6 +3460,7 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store, { g_return_if_fail(server_account_name); gboolean completed = FALSE; + PasswordDialogFields *fields = NULL; /* Initalize output parameters: */ if (cancel) @@ -3434,11 +3521,16 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store, gtk_entry_set_text (GTK_ENTRY (entry_username), initial_username); /* Dim this if a connection has ever succeeded with this username, * as per the UI spec: */ - const gboolean username_known = - modest_account_mgr_get_server_account_username_has_succeeded( - modest_runtime_get_account_mgr(), server_account_name); - gtk_widget_set_sensitive (entry_username, !username_known); - + /* const gboolean username_known = */ + /* modest_account_mgr_get_server_account_username_has_succeeded( */ + /* modest_runtime_get_account_mgr(), server_account_name); */ + /* gtk_widget_set_sensitive (entry_username, !username_known); */ + + /* We drop the username sensitive code and disallow changing it here + * as tinymail does not support really changing the username in the callback + */ + gtk_widget_set_sensitive (entry_username, FALSE); + #ifdef MODEST_PLATFORM_MAEMO /* Auto-capitalization is the default, so let's turn it off: */ hildon_gtk_entry_set_input_mode (GTK_ENTRY (entry_username), HILDON_GTK_INPUT_MODE_FULL); @@ -3490,6 +3582,15 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store, TRUE, FALSE, 0); */ + fields = g_slice_new0 (PasswordDialogFields); + fields->username = entry_username; + fields->password = entry_password; + fields->dialog = dialog; + + g_signal_connect (entry_username, "changed", G_CALLBACK (password_dialog_check_field), fields); + g_signal_connect (entry_password, "changed", G_CALLBACK (password_dialog_check_field), fields); + password_dialog_check_field (NULL, fields); + gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox)); while (!completed) { @@ -3553,6 +3654,7 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store, */ gtk_widget_destroy (dialog); + g_slice_free (PasswordDialogFields, fields); /* printf ("DEBUG: %s: cancel=%d\n", __FUNCTION__, *cancel); */ } @@ -3732,8 +3834,10 @@ paste_as_attachment_free (gpointer data) { PasteAsAttachmentHelper *helper = (PasteAsAttachmentHelper *) data; - gtk_widget_destroy (helper->banner); - g_object_unref (helper->banner); + if (helper->banner) { + gtk_widget_destroy (helper->banner); + g_object_unref (helper->banner); + } g_free (helper); } @@ -3787,7 +3891,6 @@ modest_ui_actions_on_paste (GtkAction *action, mail_op = modest_mail_operation_new (G_OBJECT (window)); if (helper->banner != NULL) { g_object_ref (G_OBJECT (helper->banner)); - gtk_window_set_modal (GTK_WINDOW (helper->banner), FALSE); gtk_widget_show (GTK_WIDGET (helper->banner)); } @@ -4584,6 +4687,21 @@ modest_ui_actions_msgs_move_to_confirmation (ModestWindow *win, } static void +move_to_helper_destroyer (gpointer user_data) +{ + MoveToHelper *helper = (MoveToHelper *) user_data; + + /* Close the "Pasting" information banner */ + if (helper->banner) { + gtk_widget_destroy (GTK_WIDGET (helper->banner)); + g_object_unref (helper->banner); + } + if (helper->reference != NULL) + gtk_tree_row_reference_free (helper->reference); + g_free (helper); +} + +static void move_to_cb (ModestMailOperation *mail_op, gpointer user_data) { @@ -4621,13 +4739,8 @@ move_to_cb (ModestMailOperation *mail_op, } g_object_unref (object); } - - /* Close the "Pasting" information banner */ - gtk_widget_destroy (GTK_WIDGET(helper->banner)); - g_object_unref (helper->banner); - if (helper->reference != NULL) - gtk_tree_row_reference_free (helper->reference); - g_free (helper); + /* Destroy the helper */ + move_to_helper_destroyer (helper); } static void @@ -4819,7 +4932,7 @@ modest_ui_actions_on_main_window_remove_attachments (GtkAction *action, 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); + modest_mail_operation_get_msg (mail_op, header, FALSE, open_msg_for_purge_cb, win); g_object_unref (mail_op); } @@ -4914,7 +5027,7 @@ xfer_messages_error_handler (ModestMailOperation *mail_op, gpointer user_data) { ModestWindow *main_window = NULL; - + /* Disable next automatic folder selection */ main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), FALSE); /* don't create */ @@ -4926,6 +5039,7 @@ xfer_messages_error_handler (ModestMailOperation *mail_op, if (win) g_object_unref (win); } + move_to_helper_destroyer (user_data); } /** @@ -4993,7 +5107,6 @@ xfer_messages_performer (gboolean canceled, _CS("ckct_nw_pasting")); if (helper->banner != NULL) { g_object_ref (helper->banner); - gtk_window_set_modal (GTK_WINDOW(helper->banner), FALSE); gtk_widget_show (GTK_WIDGET(helper->banner)); } @@ -5007,7 +5120,7 @@ xfer_messages_performer (gboolean canceled, ModestMailOperation *mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(win), xfer_messages_error_handler, - NULL, NULL); + helper, NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); @@ -5051,7 +5164,6 @@ on_move_folder_cb (gboolean canceled, GError *err, GtkWindow *parent_window, _CS("ckct_nw_pasting")); if (helper->banner != NULL) { g_object_ref (helper->banner); - gtk_window_set_modal (GTK_WINDOW(helper->banner), FALSE); gtk_widget_show (GTK_WIDGET(helper->banner)); } /* Clean folder on header view before moving it */ @@ -5359,7 +5471,7 @@ modest_ui_actions_save_attachments (GtkAction *action, { if (MODEST_IS_MSG_VIEW_WINDOW (window)) { - if (modest_platform_check_memory_low (MODEST_WINDOW(window))) + if (modest_platform_check_memory_low (MODEST_WINDOW(window), TRUE)) return; modest_msg_view_window_save_attachments (MODEST_MSG_VIEW_WINDOW (window), NULL); @@ -5405,15 +5517,53 @@ modest_ui_actions_on_help (GtkAction *action, { const gchar *help_id; - g_return_if_fail (action); g_return_if_fail (win && GTK_IS_WINDOW(win)); help_id = modest_window_mgr_get_help_id (modest_runtime_get_window_mgr(), win); - - if (help_id) - modest_platform_show_help (GTK_WINDOW (win), help_id); + + if (help_id) + modest_platform_show_help (GTK_WINDOW (win), help_id); +} + +void +modest_ui_actions_on_csm_help (GtkAction *action, + GtkWindow *win) +{ + const gchar* help_id = NULL; + GtkWidget *folder_view; + TnyFolderStore *folder_store; + + g_return_if_fail (win && MODEST_IS_MAIN_WINDOW (win)); + + /* Get selected folder */ + folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), + MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); + folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); + + /* Switch help_id */ + if (folder_store && TNY_IS_FOLDER (folder_store)) + help_id = modest_tny_folder_get_help_id (TNY_FOLDER (folder_store)); + + if (folder_store) + g_object_unref (folder_store); + + if (help_id) + modest_platform_show_help (GTK_WINDOW (win), help_id); else - g_warning ("%s: no help for window %p", __FUNCTION__, win); + modest_ui_actions_on_help (action, win); +} + +static void +retrieve_contents_cb (ModestMailOperation *mail_op, + TnyHeader *header, + gboolean canceled, + TnyMsg *msg, + GError *err, + gpointer user_data) +{ + /* We only need this callback to show an error in case of + memory low condition */ + modest_ui_actions_msg_retrieval_check (mail_op, header, msg); } static void @@ -5440,7 +5590,7 @@ retrieve_msg_contents_performer (gboolean canceled, 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); + modest_mail_operation_get_msgs_full (mail_op, headers, retrieve_contents_cb, NULL, NULL); /* Frees */ g_object_unref (mail_op); @@ -5600,7 +5750,7 @@ modest_ui_actions_on_search_messages (GtkAction *action, ModestWindow *window) /* we check for low-mem; in that case, show a warning, and don't allow * searching */ - if (modest_platform_check_memory_low (window)) + if (modest_platform_check_memory_low (window, TRUE)) return; modest_platform_show_search_messages (GTK_WINDOW (window)); @@ -5615,7 +5765,7 @@ modest_ui_actions_on_open_addressbook (GtkAction *action, ModestWindow *win) /* we check for low-mem; in that case, show a warning, and don't allow * for the addressbook */ - if (modest_platform_check_memory_low (win)) + if (modest_platform_check_memory_low (win, TRUE)) return;