X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=e119a10e2a5bad513c4a592c1090c6308261e4e6;hb=d100cc56376169d94bfa56ded0039b14a0a736f1;hp=efa8abc58635d22de6f1ca2e186d7f07b71493ce;hpb=8ed05d001f888c47a70ba2500febf7b61eae162f;p=modest diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index efa8abc..e119a10 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -427,7 +427,7 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) msg = g_strdup_printf (_("mcen_nc_unable_to_delete_n_messages"), opened_headers); - modest_platform_run_information_dialog (GTK_WINDOW (win), (const gchar *) msg); + modest_platform_run_information_dialog (GTK_WINDOW (win), (const gchar *) msg, FALSE); g_free (msg); g_object_unref (header_list); @@ -440,7 +440,10 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) iter = tny_list_create_iterator (header_list); header = TNY_HEADER (tny_iterator_get_current (iter)); if (header) { - desc = g_strdup_printf ("%s", tny_header_get_subject (header)); + gchar *subject; + subject = tny_header_dup_subject (header); + desc = g_strdup_printf ("%s", subject); + g_free (subject); g_object_unref (header); } @@ -715,6 +718,13 @@ modest_ui_actions_compose_msg(ModestWindow *win, ModestWindow *msg_win = NULL; ModestAccountMgr *mgr = modest_runtime_get_account_mgr(); ModestTnyAccountStore *store = modest_runtime_get_account_store(); + GnomeVFSFileSize total_size, allowed_size; + + /* 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)) + goto cleanup; account_name = modest_account_mgr_get_default_account(mgr); if (!account_name) { @@ -752,10 +762,22 @@ modest_ui_actions_compose_msg(ModestWindow *win, /* Create and register edit window */ /* This is destroyed by TODO. */ + total_size = 0; + allowed_size = MODEST_MAX_ATTACHMENT_SIZE; msg_win = modest_msg_edit_window_new (msg, account_name, FALSE); while (attachments) { - modest_msg_edit_window_attach_file_one((ModestMsgEditWindow *)msg_win, - attachments->data); + total_size += + modest_msg_edit_window_attach_file_one( + (ModestMsgEditWindow *)msg_win, + attachments->data, allowed_size); + + if (total_size > allowed_size) { + g_warning ("%s: total size: %u", + __FUNCTION__, (unsigned int)total_size); + break; + } + allowed_size -= total_size; + attachments = g_slist_next(attachments); } modest_window_mgr_register_window (modest_runtime_get_window_mgr(), msg_win); @@ -768,10 +790,14 @@ cleanup: g_free (signature); g_free (body); g_free (account_name); - if (account) g_object_unref (G_OBJECT(account)); - if (folder) g_object_unref (G_OBJECT(folder)); - if (msg_win) g_object_unref (G_OBJECT(msg_win)); - if (msg) g_object_unref (G_OBJECT(msg)); + if (account) + g_object_unref (G_OBJECT(account)); + if (folder) + g_object_unref (G_OBJECT(folder)); + if (msg_win) + g_object_unref (G_OBJECT(msg_win)); + if (msg) + g_object_unref (G_OBJECT(msg)); } void @@ -907,14 +933,18 @@ open_msg_cb (ModestMailOperation *mail_op, if (open_in_editor) { ModestAccountMgr *mgr = modest_runtime_get_account_mgr (); - const gchar *from_header = NULL; + gchar *from_header = NULL; - from_header = tny_header_get_from (header); + from_header = tny_header_dup_from (header); /* we cannot edit without a valid account... */ if (!modest_account_mgr_has_accounts(mgr, TRUE)) { - if (!modest_ui_actions_run_account_setup_wizard(parent_win)) + if (!modest_ui_actions_run_account_setup_wizard(parent_win)) { + modest_window_mgr_unregister_header (modest_runtime_get_window_mgr (), + header); + g_free (from_header); goto cleanup; + } } if (from_header) { @@ -931,6 +961,7 @@ open_msg_cb (ModestMailOperation *mail_op, } g_free (from); } + g_free (from_header); g_slist_foreach (accounts, (GFunc) g_free, NULL); g_slist_free (accounts); } @@ -975,9 +1006,21 @@ cleanup: g_object_unref (folder); } +static gboolean +is_memory_full_error (GError *error) +{ + if (error->code == TNY_SYSTEM_ERROR_MEMORY || + error->code == TNY_IO_ERROR_WRITE || + error->code == TNY_IO_ERROR_READ) { + return TRUE; + } else { + return FALSE; + } +} + void modest_ui_actions_disk_operations_error_handler (ModestMailOperation *mail_op, - gpointer user_data) + gpointer user_data) { const GError *error; GObject *win = NULL; @@ -990,10 +1033,7 @@ modest_ui_actions_disk_operations_error_handler (ModestMailOperation *mail_op, /* If the mail op has been cancelled then it's not an error: don't show any message */ if (status != MODEST_MAIL_OPERATION_STATUS_CANCELED) { - /* Show error */ - if (error->code == TNY_SYSTEM_ERROR_MEMORY || - error->code == TNY_IO_ERROR_WRITE || - error->code == TNY_IO_ERROR_READ) { + if (is_memory_full_error ((GError *) error)) { modest_platform_information_banner ((GtkWidget *) win, NULL, dgettext("ke-recv", "cerm_device_memory_full")); @@ -1109,6 +1149,13 @@ open_msgs_performer(gboolean canceled, modest_runtime_get_window_mgr ()); /* Free the helper */ open_msgs_helper_destroyer (helper); + + /* In memory full conditions we could get this error here */ + if (err && is_memory_full_error (err)) { + modest_platform_information_banner ((GtkWidget *) parent_window, + NULL, dgettext("ke-recv", + "cerm_device_memory_full")); + } goto clean; } @@ -1127,8 +1174,10 @@ open_msgs_performer(gboolean canceled, } else if (proto == MODEST_PROTOCOL_STORE_IMAP) { TnyIterator *iter = tny_list_create_iterator (not_opened_headers); TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter)); + gchar *subject = tny_header_dup_subject (header); error_msg = g_strdup_printf (_("emev_ni_ui_imap_message_not_available_in_server"), - tny_header_get_subject (header)); + subject); + g_free (subject); g_object_unref (header); g_object_unref (iter); } else { @@ -1355,6 +1404,12 @@ void modest_ui_actions_on_open (GtkAction *action, ModestWindow *win) { TnyList *headers; + + /* 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))) + return; /* Get headers */ headers = get_selected_headers (win); @@ -1548,6 +1603,13 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) 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))) + return; + + /* we need an account when editing */ if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE)) { if (!modest_ui_actions_run_account_setup_wizard (win)) @@ -1804,6 +1866,7 @@ typedef struct { gchar *account_name; gboolean poke_status; gboolean interactive; + ModestMailOperation *mail_op; } SendReceiveInfo; static void @@ -1813,12 +1876,21 @@ do_send_receive_performer (gboolean canceled, TnyAccount *account, gpointer user_data) { - ModestMailOperation *mail_op; SendReceiveInfo *info; info = (SendReceiveInfo *) user_data; if (err || canceled) { + /* In memory full conditions we could get this error here */ + if (err && is_memory_full_error (err)) { + modest_platform_information_banner ((GtkWidget *) parent_window, + NULL, dgettext("ke-recv", + "cerm_device_memory_full")); + } + if (info->mail_op) { + modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), + info->mail_op); + } goto clean; } @@ -1826,25 +1898,21 @@ do_send_receive_performer (gboolean canceled, if (info->win && MODEST_IS_MAIN_WINDOW (info->win)) { modest_main_window_notify_send_receive_initied (MODEST_MAIN_WINDOW (info->win)); } - - mail_op = modest_mail_operation_new_with_error_handling ((info->win) ? G_OBJECT (info->win) : NULL, - modest_ui_actions_send_receive_error_handler, - NULL, NULL); if (info->win && MODEST_IS_MAIN_WINDOW (info->win)) - g_signal_connect (G_OBJECT(mail_op), "operation-finished", + g_signal_connect (G_OBJECT (info->mail_op), "operation-finished", G_CALLBACK (on_send_receive_finished), info->win); /* 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, info->interactive, + modest_mail_operation_update_account (info->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)); clean: /* Frees */ + if (info->mail_op) + g_object_unref (G_OBJECT (info->mail_op)); if (info->account_name) g_free (info->account_name); if (info->win) @@ -1896,6 +1964,13 @@ modest_ui_actions_do_send_receive (const gchar *account_name, info->interactive = interactive; info->account = modest_tny_account_store_get_server_account (acc_store, acc_name, TNY_ACCOUNT_TYPE_STORE); + /* We need to create the operation here, because otherwise it + could happen that the queue emits the queue-empty signal + while we're trying to connect the account */ + info->mail_op = modest_mail_operation_new_with_error_handling ((info->win) ? G_OBJECT (info->win) : NULL, + modest_ui_actions_disk_operations_error_handler, + NULL, NULL); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), info->mail_op); /* Invoke the connect and perform */ modest_platform_connect_and_perform ((win) ? GTK_WINDOW (win) : NULL, @@ -2127,6 +2202,12 @@ modest_ui_actions_on_header_activated (ModestHeaderView *header_view, return; } + /* 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))) + return; + /* headers = tny_simple_list_new (); */ /* tny_list_prepend (headers, G_OBJECT (header)); */ @@ -2197,6 +2278,7 @@ folder_refreshed_cb (ModestMailOperation *mail_op, if (tny_folder_get_all_count (folder) == 0) modest_main_window_set_contents_style (win, MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY); + } void @@ -2259,18 +2341,24 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view, G_OBJECT(header_view), MODEST_CONF_HEADER_VIEW_KEY); } else { - /* Update the active account */ - //modest_window_set_active_account (MODEST_WINDOW (main_window), NULL); - /* Save only if we're seeing headers */ + /* No need to save the header view + configuration for Maemo because it only + saves the sorting stuff and that it's + already being done by the sort + dialog. Remove it when the GNOME version + has the same behaviour */ +#ifdef MODEST_PLATFORM_GNOME if (modest_main_window_get_contents_style (main_window) == MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS) modest_widget_memory_save (conf, G_OBJECT (header_view), MODEST_CONF_HEADER_VIEW_KEY); +#endif modest_header_view_clear (MODEST_HEADER_VIEW(header_view)); } } - /* Update toolbar dimming state */ + /* Update dimming state */ + modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (main_window)); modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window)); } @@ -2346,7 +2434,13 @@ 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 + */ + if (modest_platform_check_memory_low (MODEST_WINDOW(win))) + return; + modest_msg_view_window_view_attachment (MODEST_MSG_VIEW_WINDOW (win), mime_part); } @@ -2420,6 +2514,21 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi return FALSE; } + + /* + * djcb: if we're in low-memory state, we only allow for + * saving messages smaller than + * MODEST_MAX_LOW_MEMORY_MESSAGE_SIZE (see modest-defs.h) 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))) { + modest_msg_edit_window_free_msg_data (edit_window, data); + return FALSE; + } + } + account_name = g_strdup (data->account_name); account_mgr = modest_runtime_get_account_mgr(); if (!account_name) @@ -2562,6 +2671,20 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) return FALSE; } + + /* + * djcb: if we're in low-memory state, we only allow for sending messages + * smaller than MODEST_MAX_LOW_MEMORY_MESSAGE_SIZE (see modest-defs.h) + * 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))) { + modest_msg_edit_window_free_msg_data (edit_window, data); + return FALSE; + } + } + + ModestAccountMgr *account_mgr = modest_runtime_get_account_mgr(); gchar *account_name = g_strdup (data->account_name); if (!account_name) @@ -2762,6 +2885,10 @@ modest_ui_actions_on_insert_image (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))) + return; + if (modest_msg_edit_window_get_format (MODEST_MSG_EDIT_WINDOW(window)) == MODEST_MSG_EDIT_FORMAT_TEXT) return; @@ -2775,6 +2902,9 @@ 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))) + return; + modest_msg_edit_window_offer_attach_file (window); } @@ -2826,9 +2956,12 @@ do_create_folder_cb (ModestMailOperation *mail_op, folder_view = get_folder_view_from_move_to_dialog (GTK_WIDGET(source_win)); - /* Select the newly created folder */ - modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view), - new_folder, FALSE); + /* 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 */ + if (folder_view) + modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view), + new_folder, FALSE); g_object_unref (new_folder); } /* Free. Note that the first time it'll be NULL so noop */ @@ -2852,7 +2985,7 @@ do_create_folder (GtkWindow *parent_window, if (result == GTK_RESPONSE_ACCEPT) { ModestMailOperation *mail_op; - mail_op = modest_mail_operation_new (NULL); + mail_op = modest_mail_operation_new ((GObject *) parent_window); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); modest_mail_operation_create_folder (mail_op, @@ -2874,6 +3007,12 @@ create_folder_performer (gboolean canceled, TnyFolderStore *parent_folder = TNY_FOLDER_STORE (user_data); if (canceled || err) { + /* In memory full conditions we could get this error here */ + if (err && is_memory_full_error (err)) { + modest_platform_information_banner ((GtkWidget *) parent_window, + NULL, dgettext("ke-recv", + "cerm_device_memory_full")); + } goto frees; } @@ -2975,7 +3114,14 @@ on_rename_folder_performer (gboolean canceled, GtkWidget *folder_view = NULL; RenameFolderInfo *data = (RenameFolderInfo*)user_data; - if (!canceled && (err == NULL) && MODEST_IS_MAIN_WINDOW(parent_window)) { + if (canceled || err) { + /* In memory full conditions we could get this error here */ + if (err && is_memory_full_error (err)) { + modest_platform_information_banner ((GtkWidget *) parent_window, + NULL, dgettext("ke-recv", + "cerm_device_memory_full")); + } + } else if (MODEST_IS_MAIN_WINDOW(parent_window)) { folder_view = modest_main_window_get_child_widget ( MODEST_MAIN_WINDOW (parent_window), @@ -2999,9 +3145,9 @@ on_rename_folder_performer (gboolean canceled, (const gchar *) (data->new_name), on_rename_folder_cb, folder_view); + g_object_unref (mail_op); } - g_object_unref (mail_op); g_free (data->new_name); g_free (data); } @@ -3066,7 +3212,8 @@ modest_ui_actions_delete_folder_error_handler (ModestMailOperation *mail_op, GObject *win = modest_mail_operation_get_source (mail_op); modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL, - _("mail_in_ui_folder_delete_error")); + _("mail_in_ui_folder_delete_error"), + FALSE); g_object_unref (win); } @@ -3138,7 +3285,8 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) /* Show an error if it's an account */ if (!TNY_IS_FOLDER (folder)) { modest_platform_run_information_dialog (GTK_WINDOW (main_window), - _("mail_in_ui_folder_delete_error")); + _("mail_in_ui_folder_delete_error"), + FALSE); g_object_unref (G_OBJECT (folder)); return; } @@ -4341,40 +4489,6 @@ create_move_to_dialog (GtkWindow *win, return dialog; } -/* - * Returns TRUE if at least one of the headers of the list belongs to - * a message that has been fully retrieved. - */ -#if 0 /* no longer in use. delete in 2007.10 */ -static gboolean -has_retrieved_msgs (TnyList *list) -{ - TnyIterator *iter; - gboolean found = FALSE; - - iter = tny_list_create_iterator (list); - while (!tny_iterator_is_done (iter) && !found) { - TnyHeader *header; - TnyHeaderFlags flags = 0; - - header = TNY_HEADER (tny_iterator_get_current (iter)); - if (header) { - flags = tny_header_get_flags (header); - if (flags & TNY_HEADER_FLAG_CACHED) -/* if (!(flags & TNY_HEADER_FLAG_PARTIAL)) */ - found = TRUE; - - g_object_unref (header); - } - - if (!found) - tny_iterator_next (iter); - } - g_object_unref (iter); - - return found; -} -#endif /* 0 */ /* @@ -4467,6 +4581,10 @@ move_to_cb (ModestMailOperation *mail_op, MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (header_view)); path = gtk_tree_row_reference_get_path (helper->reference); + /* We need to unselect the previous one + because we could be copying instead of + moving */ + gtk_tree_selection_unselect_all (sel); gtk_tree_selection_select_path (sel, path); gtk_tree_path_free (path); } @@ -4475,6 +4593,7 @@ move_to_cb (ModestMailOperation *mail_op, /* 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); @@ -4510,12 +4629,12 @@ modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op, gpointer user_data) { ModestWindow *main_window = NULL; - GObject *win = NULL; /* Disable next automatic folder selection */ main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), FALSE); /* don't create */ if (main_window) { + GObject *win = NULL; GtkWidget *folder_view = NULL; folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (main_window), @@ -4526,36 +4645,15 @@ modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op, modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view), TNY_FOLDER (user_data), FALSE); } - } - - /* Show notification dialog */ - win = modest_mail_operation_get_source (mail_op); - modest_platform_run_information_dialog ((GtkWindow *) win, _("mail_in_ui_folder_move_target_error")); - if (win) - g_object_unref (win); -} -void -modest_ui_actions_send_receive_error_handler (ModestMailOperation *mail_op, - gpointer user_data) -{ - GObject *win = modest_mail_operation_get_source (mail_op); - const GError *error = modest_mail_operation_get_error (mail_op); - - g_return_if_fail (error != NULL); - if (error->message != NULL) - g_printerr ("modest: %s\n", error->message); - else - g_printerr ("modest: unkonw error on send&receive operation"); - - /* Show error message */ -/* if (modest_mail_operation_get_id (mail_op) == MODEST_MAIL_OPERATION_TYPE_RECEIVE) */ -/* modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL, */ -/* _CS("sfil_ib_unable_to_receive")); */ -/* else */ -/* modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL, */ -/* _CS("sfil_ib_unable_to_send")); */ - g_object_unref (win); + /* Show notification dialog only if the main window exists */ + win = modest_mail_operation_get_source (mail_op); + modest_platform_run_information_dialog ((GtkWindow *) win, + _("mail_in_ui_folder_move_target_error"), + FALSE); + if (win) + g_object_unref (win); + } } static void @@ -4780,6 +4878,24 @@ modest_ui_actions_xfer_messages_check (GtkWindow *parent_window, g_object_unref (src_account); } +static void +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 */ + if (main_window) { + GObject *win = modest_mail_operation_get_source (mail_op); + modest_platform_run_information_dialog ((GtkWindow *) win, + _("mail_in_ui_folder_move_target_error"), + FALSE); + if (win) + g_object_unref (win); + } +} /** * Utility function that transfer messages from both the main window @@ -4799,11 +4915,19 @@ xfer_messages_performer (gboolean canceled, const gchar *proto_str = NULL; gboolean dst_is_pop = FALSE; - if (canceled || err) { - /* Show the proper error message */ - modest_ui_actions_on_account_connection_error (parent_window, account); - g_object_unref (dst_folder); - return; + if (canceled) + goto end; + + if (err) { + if (is_memory_full_error (err)) { + modest_platform_information_banner ((GtkWidget *) parent_window, + NULL, dgettext("ke-recv", + "cerm_device_memory_full")); + } else { + /* Show the proper error message */ + modest_ui_actions_on_account_connection_error (parent_window, account); + } + goto end; } dst_account = tny_folder_get_account (TNY_FOLDER (dst_folder)); @@ -4838,6 +4962,7 @@ xfer_messages_performer (gboolean canceled, helper->banner = modest_platform_animation_banner (GTK_WIDGET (win), NULL, _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)); } @@ -4851,7 +4976,7 @@ xfer_messages_performer (gboolean canceled, ModestMailOperation *mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(win), - modest_ui_actions_move_folder_error_handler, + xfer_messages_error_handler, NULL, NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); @@ -4865,6 +4990,7 @@ xfer_messages_performer (gboolean canceled, g_object_unref (G_OBJECT (mail_op)); g_object_unref (headers); + end: g_object_unref (dst_folder); } @@ -4894,6 +5020,7 @@ on_move_folder_cb (gboolean canceled, GError *err, GtkWindow *parent_window, helper->banner = modest_platform_animation_banner (GTK_WIDGET (parent_window), NULL, _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)); } @@ -4922,21 +5049,21 @@ on_move_folder_cb (gboolean canceled, GError *err, GtkWindow *parent_window, /* modest_folder_view_select_folder (MODEST_FOLDER_VIEW(folder_view), */ /* TNY_FOLDER (src_folder), TRUE); */ + modest_folder_view_select_folder (MODEST_FOLDER_VIEW(info->folder_view), + TNY_FOLDER (info->dst_folder), TRUE); modest_mail_operation_xfer_folder (mail_op, TNY_FOLDER (info->src_folder), info->dst_folder, info->delete_original, folder_move_to_cb, helper); + g_object_unref (G_OBJECT (info->src_folder)); - if (modest_mail_operation_get_status (mail_op) == MODEST_MAIL_OPERATION_STATUS_SUCCESS) { - modest_folder_view_select_folder (MODEST_FOLDER_VIEW(info->folder_view), - TNY_FOLDER (info->dst_folder), TRUE); - } + /* if (modest_mail_operation_get_status (mail_op) == MODEST_MAIL_OPERATION_STATUS_SUCCESS) { */ + /* } */ /* Unref mail operation */ g_object_unref (G_OBJECT (mail_op)); - g_object_unref (G_OBJECT (info->src_folder)); g_object_unref (G_OBJECT (info->dst_folder)); g_free (user_data); } @@ -5202,6 +5329,10 @@ modest_ui_actions_save_attachments (GtkAction *action, ModestWindow *window) { if (MODEST_IS_MSG_VIEW_WINDOW (window)) { + + if (modest_platform_check_memory_low (MODEST_WINDOW(window))) + return; + modest_msg_view_window_save_attachments (MODEST_MSG_VIEW_WINDOW (window), NULL); } else { /* not supported window for this action */ @@ -5267,6 +5398,11 @@ retrieve_msg_contents_performer (gboolean canceled, TnyList *headers = TNY_LIST (user_data); if (err || canceled) { + if (err && is_memory_full_error (err)) { + modest_platform_information_banner ((GtkWidget *) parent_window, + NULL, dgettext("ke-recv", + "cerm_device_memory_full")); + } goto out; } @@ -5432,6 +5568,12 @@ modest_ui_actions_on_search_messages (GtkAction *action, ModestWindow *window) { g_return_if_fail (MODEST_IS_WINDOW (window)); + /* we check for low-mem; in that case, show a warning, and don't allow + * searching + */ + if (modest_platform_check_memory_low (window)) + return; + modest_platform_show_search_messages (GTK_WINDOW (window)); } @@ -5439,6 +5581,15 @@ void modest_ui_actions_on_open_addressbook (GtkAction *action, ModestWindow *win) { g_return_if_fail (MODEST_IS_WINDOW (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)) + return; + + modest_platform_show_addressbook (GTK_WINDOW (win)); } @@ -5557,7 +5708,7 @@ modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self, should show the Accounts Settings dialog or the Connection specific SMTP server window */ - modest_platform_run_information_dialog (NULL, message); + modest_platform_run_information_dialog (NULL, message, FALSE); g_free (message); g_object_unref (server_account); } @@ -5643,7 +5794,7 @@ modest_ui_actions_on_account_connection_error (GtkWindow *parent_window, } if (error_note) { - modest_platform_run_information_dialog (parent_window, error_note); + modest_platform_run_information_dialog (parent_window, error_note, FALSE); g_free (error_note); } } @@ -5685,8 +5836,11 @@ modest_ui_actions_get_msg_already_deleted_error_msg (ModestWindow *win) if (proto == MODEST_PROTOCOL_STORE_POP) { msg = g_strdup (_("emev_ni_ui_pop3_msg_recv_error")); } else if (proto == MODEST_PROTOCOL_STORE_IMAP) { + gchar *subject; + subject = tny_header_dup_subject (header); msg = g_strdup_printf (_("emev_ni_ui_imap_message_not_available_in_server"), - tny_header_get_subject (header)); + subject); + g_free (subject); } else { msg = g_strdup_printf (_("mail_ni_ui_folder_get_msg_folder_error")); }