X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=4512dbed6f8efb2013e9d7853743c0044f4bd8e3;hp=f3f7ad8c1126129bfec8ad26817832c423ac5c33;hb=431e6afaedd1f67abdca9e5bb7b14e5027401d00;hpb=f4b0b2562bf8450100dfaaed047ff78a5019533c diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index f3f7ad8..4512dbe 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -46,6 +46,7 @@ #include "modest-platform.h" #include "modest-debug.h" #include +#include #include #include #include @@ -768,6 +769,54 @@ modest_ui_actions_on_smtp_servers (GtkAction *action, ModestWindow *win) #endif /* !MODEST_TOOLKIT_GTK */ } +static guint64 +count_part_size (const gchar *part) +{ + GnomeVFSURI *vfs_uri; + gchar *escaped_filename; + gchar *filename; + GnomeVFSFileInfo *info; + guint64 result; + + /* Estimation of attachment size if we cannot get it from file info */ + result = 32768; + + vfs_uri = gnome_vfs_uri_new (part); + + escaped_filename = g_path_get_basename (gnome_vfs_uri_get_path (vfs_uri)); + filename = gnome_vfs_unescape_string_for_display (escaped_filename); + g_free (escaped_filename); + gnome_vfs_uri_unref (vfs_uri); + + info = gnome_vfs_file_info_new (); + + if (gnome_vfs_get_file_info (part, + info, + GNOME_VFS_FILE_INFO_GET_MIME_TYPE) + == GNOME_VFS_OK) { + if (info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE) { + result = info->size; + } + } + g_free (filename); + gnome_vfs_file_info_unref (info); + + return result; +} + +static guint64 +count_parts_size (GSList *parts) +{ + GSList *node; + guint64 result = 0; + + for (node = parts; node != NULL; node = g_slist_next (node)) { + result += count_part_size ((const gchar *) node->data); + } + + return result; +} + void modest_ui_actions_compose_msg(ModestWindow *win, const gchar *to_str, @@ -790,11 +839,37 @@ modest_ui_actions_compose_msg(ModestWindow *win, ModestAccountMgr *mgr = modest_runtime_get_account_mgr(); ModestTnyAccountStore *store = modest_runtime_get_account_store(); GnomeVFSFileSize total_size, allowed_size; + guint64 available_disk, expected_size, parts_size; + guint parts_count; /* we check for low-mem */ if (modest_platform_check_memory_low (win, TRUE)) goto cleanup; + available_disk = modest_utils_get_available_space (NULL); + parts_count = g_slist_length (attachments); + parts_size = count_parts_size (attachments); + expected_size = modest_tny_msg_estimate_size (body, NULL, parts_count, parts_size); + + /* Double check: memory full condition or message too big */ + if (available_disk < MIN_FREE_SPACE || + expected_size > available_disk) { + gchar *msg = g_strdup_printf (_KR("cerm_device_memory_full"), ""); + modest_platform_information_banner (NULL, NULL, msg); + g_free (msg); + + return; + } + + if (expected_size > MODEST_MAX_ATTACHMENT_SIZE) { + modest_platform_run_information_dialog ( + GTK_WINDOW(win), + _KR("memr_ib_operation_disabled"), + TRUE); + return; + } + + #ifdef MODEST_TOOLKIT_HILDON2 if (win) account_name = g_strdup (modest_window_get_active_account(win)); @@ -856,16 +931,18 @@ modest_ui_actions_compose_msg(ModestWindow *win, gtk_widget_show_all (GTK_WIDGET (msg_win)); while (attachments) { - total_size += + GnomeVFSFileSize att_size; + att_size = modest_msg_edit_window_attach_file_one((ModestMsgEditWindow *)msg_win, attachments->data, allowed_size); + total_size += att_size; - if (total_size > allowed_size) { + if (att_size > allowed_size) { g_warning ("%s: total size: %u", __FUNCTION__, (unsigned int)total_size); break; } - allowed_size -= total_size; + allowed_size -= att_size; attachments = g_slist_next(attachments); } @@ -2135,9 +2212,34 @@ new_messages_arrived (ModestMailOperation *self, send&receive was invoked by the user then do not show any visual notification, only play a sound and activate the LED (for the Maemo version) */ - if (TNY_IS_LIST(new_headers) && (tny_list_get_length (new_headers)) > 0) - modest_platform_on_new_headers_received (new_headers, - show_visual_notifications); + if (TNY_IS_LIST(new_headers) && (tny_list_get_length (new_headers)) > 0) { + + /* We only notify about really new messages (not seen) we get */ + TnyList *actually_new_list; + TnyIterator *iterator; + actually_new_list = TNY_LIST (tny_simple_list_new ()); + for (iterator = tny_list_create_iterator (new_headers); + !tny_iterator_is_done (iterator); + tny_iterator_next (iterator)) { + TnyHeader *header; + TnyHeaderFlags flags; + header = TNY_HEADER (tny_iterator_get_current (iterator)); + flags = tny_header_get_flags (header); + + if (!(flags & TNY_HEADER_FLAG_SEEN)) { + tny_list_append (actually_new_list, G_OBJECT (header)); + } + g_object_unref (header); + + } + g_object_unref (iterator); + + if (tny_list_get_length (actually_new_list) > 0) { + modest_platform_on_new_headers_received (actually_new_list, + show_visual_notifications); + } + g_object_unref (actually_new_list); + } } @@ -2618,7 +2720,6 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view, gboolean selected, ModestMainWindow *main_window) { - ModestConf *conf; GtkWidget *header_view; g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window)); @@ -2628,7 +2729,6 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view, if (!header_view) return; - conf = modest_runtime_get_conf (); if (TNY_IS_ACCOUNT (folder_store)) { if (selected) { @@ -2640,14 +2740,11 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view, } else { if (TNY_IS_FOLDER (folder_store) && selected) { TnyAccount *account; - const gchar *account_name = NULL; /* Update the active account */ account = modest_tny_folder_get_account (TNY_FOLDER (folder_store)); if (account) { set_active_account_from_tny_account (account, MODEST_WINDOW (main_window)); - account_name = - modest_tny_account_get_parent_modest_account_name_for_server_account (account); g_object_unref (account); account = NULL; } @@ -2687,7 +2784,8 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view, #ifdef MODEST_TOOLKIT_GTK 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_widget_memory_save (modest_runtime_get_conf (), + G_OBJECT (header_view), MODEST_CONF_HEADER_VIEW_KEY); #endif modest_header_view_clear (MODEST_HEADER_VIEW(header_view)); @@ -2825,13 +2923,11 @@ static gboolean enough_space_for_message (ModestMsgEditWindow *edit_window, MsgData *data) { - TnyAccountStore *acc_store; guint64 available_disk, expected_size; gint parts_count; guint64 parts_size; /* Check size */ - acc_store = TNY_ACCOUNT_STORE (modest_runtime_get_account_store()); available_disk = modest_utils_get_available_space (NULL); modest_msg_edit_window_get_parts_size (edit_window, &parts_count, &parts_size); expected_size = modest_tny_msg_estimate_size (data->plain_body, @@ -3343,6 +3439,19 @@ do_create_folder_performer (gboolean canceled, if (canceled || err) { /* In memory full conditions we could get this error here */ check_memory_full_error ((GtkWidget *) parent_window, err); + + /* This happens if we have selected the outbox folder + as the parent */ + if (err->code == TNY_SERVICE_ERROR_UNKNOWN && + TNY_IS_MERGE_FOLDER (helper->parent)) { + /* Show an error and retry */ + modest_platform_information_banner ((GtkWidget *) parent_window, + NULL, + _("mail_in_ui_folder_create_error")); + + do_create_folder (parent_window, helper->parent, helper->folder_name); + } + goto frees; } @@ -4923,6 +5032,7 @@ on_move_to_dialog_response (GtkDialog *dialog, GtkWidget *parent_win; MoveToInfo *helper = NULL; ModestFolderView *folder_view; + gboolean unset_edit_mode = FALSE; helper = (MoveToInfo *) user_data; @@ -4984,6 +5094,7 @@ on_move_to_dialog_response (GtkDialog *dialog, if (dst_folder) g_object_unref (dst_folder); + unset_edit_mode = TRUE; break; default: g_warning ("%s unexpected response id %d", __FUNCTION__, response); @@ -4992,6 +5103,11 @@ on_move_to_dialog_response (GtkDialog *dialog, /* Free the helper and exit */ if (helper->list) g_object_unref (helper->list); + if (unset_edit_mode) { +#ifdef MODEST_TOOLKIT_HILDON2 + modest_hildon2_window_unset_edit_mode (MODEST_HILDON2_WINDOW (helper->win)); +#endif + } g_slice_free (MoveToInfo, helper); gtk_widget_destroy (GTK_WIDGET (dialog)); } @@ -5951,7 +6067,7 @@ modest_ui_actions_on_edit_mode_move_to (ModestWindow *win) /* Show the dialog */ gtk_widget_show (dialog); - return TRUE; + return FALSE; } /* @@ -6611,7 +6727,8 @@ modest_ui_actions_get_msg_already_deleted_error_msg (ModestWindow *win) #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)); + if (header) + folder = TNY_FOLDER_STORE (tny_header_get_folder (header)); } if (!header || !folder)