Fixes NB#121486, show the proper logical id when the attachment is too big

diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c
index e3e6b75..cc2b4a9 100644 (file)
--- a/src/hildon2/modest-msg-edit-window.c
+++ b/src/hildon2/modest-msg-edit-window.c
@@ -2602,8 +2602,8 @@ modest_msg_edit_window_attach_file_one (ModestMsgEditWindow *window,
                    info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE) {
                        size = info->size;
                        if (size > allowed_size) {
                    info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE) {
                        size = info->size;
                        if (size > allowed_size) {

-                               modest_platform_information_banner (NULL, NULL, 
-                                                                   _FM("sfil_ib_opening_not_allowed"));
+                               modest_platform_information_banner (NULL, NULL,
+                                                                   _("mail_ib_error_attachment_size"));

                                g_free (filename);
                                return 0;
                        }
                                g_free (filename);
                                return 0;
                        }

diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c
index 8df4673..1fad332 100644 (file)
--- a/src/maemo/modest-msg-edit-window.c
+++ b/src/maemo/modest-msg-edit-window.c
@@ -2386,8 +2386,8 @@ modest_msg_edit_window_attach_file_one (ModestMsgEditWindow *window,
                    info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE) {
                        size = info->size;
                        if (size > allowed_size) {
                    info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE) {
                        size = info->size;
                        if (size > allowed_size) {

-                               modest_platform_information_banner (NULL, NULL, 
-                                                                   _FM("sfil_ib_opening_not_allowed"));
+                               modest_platform_information_banner (NULL, NULL,
+                                                                   _("mail_ib_error_attachment_size"));

                                return 0;
                        }
                } else
                                return 0;
                        }
                } else

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 94f7939..048749d 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -863,7 +863,7 @@ modest_ui_actions_compose_msg(ModestWindow *win,
        if (expected_size > MODEST_MAX_ATTACHMENT_SIZE) {
                modest_platform_run_information_dialog (
                        GTK_WINDOW(win),
        if (expected_size > MODEST_MAX_ATTACHMENT_SIZE) {
                modest_platform_run_information_dialog (
                        GTK_WINDOW(win),

-                       _FM("sfil_ib_opening_not_allowed"),
+                       _("mail_ib_error_attachment_size"),

                        TRUE);
                return;
        }
                        TRUE);
                return;
        }

@@ -2929,7 +2929,7 @@ enough_space_for_message (ModestMsgEditWindow *edit_window,
        if (expected_size > MODEST_MAX_ATTACHMENT_SIZE) {
                modest_platform_run_information_dialog (
                        GTK_WINDOW(edit_window),
        if (expected_size > MODEST_MAX_ATTACHMENT_SIZE) {
                modest_platform_run_information_dialog (
                        GTK_WINDOW(edit_window),

-                       _FM("sfil_ib_opening_not_allowed"),
+                       _("mail_ib_error_attachment_size"),

                        TRUE);
                return FALSE;
        }
                        TRUE);
                return FALSE;
        }