Work to fix bug NB#80656.
[modest] / src / modest-ui-actions.c
index e119a10..765dc88 100644 (file)
@@ -164,11 +164,6 @@ 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 transfer_messages_helper (GtkWindow *win,
-                                     TnyFolder *src_folder,
-                                     TnyList *headers,
-                                     TnyFolder *dst_folder);
-
 /*
  * This function checks whether a TnyFolderStore is a pop account
  */
@@ -754,7 +749,7 @@ modest_ui_actions_compose_msg(ModestWindow *win,
                body = use_signature ? g_strconcat("\n", signature, NULL) : g_strdup("");
        }
 
-       msg = modest_tny_msg_new (to_str, from_str, cc_str, bcc_str, subject_str, body, NULL);
+       msg = modest_tny_msg_new (to_str, from_str, cc_str, bcc_str, subject_str, body, NULL, NULL);
        if (!msg) {
                g_printerr ("modest: failed to create new msg\n");
                goto cleanup;
@@ -772,7 +767,7 @@ modest_ui_actions_compose_msg(ModestWindow *win,
                                attachments->data, allowed_size);
 
                if (total_size > allowed_size) {
-                       g_warning ("%s: total size: %u", 
+                       g_warning ("%s: total size: %u",
                                   __FUNCTION__, (unsigned int)total_size);
                        break;
                }
@@ -1037,6 +1032,9 @@ modest_ui_actions_disk_operations_error_handler (ModestMailOperation *mail_op,
                        modest_platform_information_banner ((GtkWidget *) win,
                                                            NULL, dgettext("ke-recv",
                                                                           "cerm_device_memory_full"));
+               } else if (error->code == MODEST_MAIL_OPERATION_ERROR_FILE_IO) {
+                       modest_platform_information_banner ((GtkWidget *) win,
+                                                           NULL, dgettext ("hildon-common-strings", "sfil_ni_unable_to_open_file_not_found"));
                } else if (user_data) {
                        modest_platform_information_banner ((GtkWidget *) win, 
                                                            NULL, user_data);
@@ -2514,7 +2512,6 @@ 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
@@ -2529,6 +2526,21 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi
                }
        }
 
+       /*
+        * djcb: we also make sure that the attachments are smaller than the max size
+        * this is for the case where we'd try to forward a message with attachments 
+        * bigger than our max allowed size, or sending an message from drafts which
+        * somehow got past our checks when attaching.
+        */
+       if (expected_size > MODEST_MAX_ATTACHMENT_SIZE) {
+               modest_platform_run_information_dialog (
+                       GTK_WINDOW(edit_window),
+                       dgettext("ke-recv","memr_ib_operation_disabled"),
+                       TRUE);
+               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)
@@ -2684,6 +2696,20 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
                }
        }
 
+       /*
+        * djcb: we also make sure that the attachments are smaller than the max size
+        * this is for the case where we'd try to forward a message with attachments 
+        * bigger than our max allowed size, or sending an message from drafts which
+        * somehow got past our checks when attaching.
+        */
+       if (expected_size > MODEST_MAX_ATTACHMENT_SIZE) {
+               modest_platform_run_information_dialog (
+                       GTK_WINDOW(edit_window),
+                       dgettext("ke-recv","memr_ib_operation_disabled"),
+                       TRUE);
+               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);
@@ -2718,7 +2744,7 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
        gchar *from = modest_account_mgr_get_from_string (account_mgr, account_name);
 
        /* Create the mail operation */
-       ModestMailOperation *mail_operation = modest_mail_operation_new (NULL);
+       ModestMailOperation *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_send_new_mail (mail_operation,
@@ -3093,6 +3119,11 @@ on_rename_folder_cb (ModestMailOperation *mail_op,
 {
        ModestFolderView *folder_view;
 
+       /* If the window was closed when renaming a folder this could
+          happen */
+       if (MODEST_IS_FOLDER_VIEW (user_data))
+               return;
+
        folder_view = MODEST_FOLDER_VIEW (user_data);
        /* Note that if the rename fails new_folder will be NULL */
        if (new_folder) {
@@ -4944,10 +4975,9 @@ xfer_messages_performer  (gboolean canceled,
        headers = get_selected_headers (MODEST_WINDOW (win));
        if (!headers) {
                g_warning ("%s: no headers selected", __FUNCTION__);
-               return;
+               goto end;
        }
 
-
        if (dst_is_pop) {
                modest_platform_information_banner (GTK_WIDGET (win),
                                                    NULL,
@@ -4955,7 +4985,7 @@ xfer_messages_performer  (gboolean canceled,
                                                             "mail_in_ui_folder_move_targets_error",
                                                             tny_list_get_length (headers)));
                g_object_unref (headers);
-               return;
+               goto end;
        }
 
        MoveToHelper *helper = g_new0 (MoveToHelper, 1);
@@ -5135,8 +5165,8 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action,
                headers = modest_header_view_get_selected_headers(header_view);
 
                /* Transfer the messages */
-               transfer_messages_helper (GTK_WINDOW (win), TNY_FOLDER (src_folder), 
-                                         headers, TNY_FOLDER (dst_folder));
+               modest_ui_actions_transfer_messages_helper (GTK_WINDOW (win), TNY_FOLDER (src_folder), 
+                                                           headers, TNY_FOLDER (dst_folder));
 
                g_object_unref (headers);
        }
@@ -5146,11 +5176,11 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action,
 }
 
 
-static void
-transfer_messages_helper (GtkWindow *win,
-                         TnyFolder *src_folder,
-                         TnyList *headers,
-                         TnyFolder *dst_folder)
+void
+modest_ui_actions_transfer_messages_helper (GtkWindow *win,
+                                           TnyFolder *src_folder,
+                                           TnyList *headers,
+                                           TnyFolder *dst_folder)
 {
        gboolean need_connection = TRUE;
        gboolean do_xfer = TRUE;
@@ -5176,8 +5206,7 @@ transfer_messages_helper (GtkWindow *win,
        } else {
                TnyAccount *src_account = get_account_from_folder_store (TNY_FOLDER_STORE (src_folder));
                xfer_messages_performer (FALSE, NULL, GTK_WINDOW (win),
-                                        src_account, 
-                                        g_object_ref (dst_folder));
+                                        src_account, g_object_ref (dst_folder));
                g_object_unref (src_account);
        }
 }
@@ -5204,8 +5233,8 @@ modest_ui_actions_on_msg_view_window_move_to (GtkAction *action,
        tny_list_append (headers, G_OBJECT (header));
 
        /* Transfer the messages */
-       transfer_messages_helper (GTK_WINDOW (win), src_folder, headers, 
-                                 TNY_FOLDER (dst_folder));
+       modest_ui_actions_transfer_messages_helper (GTK_WINDOW (win), src_folder, headers, 
+                                                   TNY_FOLDER (dst_folder));
 
        /* Frees */
        g_object_unref (header);