* Fixes NB#101040, embbeded messages are not offered to be saved

pmo-trunk-r7477

diff --git a/src/hildon2/modest-maemo-utils.c b/src/hildon2/modest-maemo-utils.c
index 4d2a495..02999f2 100644 (file)
--- a/src/hildon2/modest-maemo-utils.c
+++ b/src/hildon2/modest-maemo-utils.c
@@ -483,31 +483,21 @@ modest_maemo_utils_select_attachments (GtkWindow *window, TnyList *att_list)
             tny_iterator_next (iterator)) {
                GtkTreeIter iter;
                TnyMimePart *part;
-               gchar *label;
-               gchar *filename = NULL;
 
                part = (TnyMimePart *) tny_iterator_get_current (iterator);
 
-               if (TNY_IS_MSG (part)) {
-                       TnyHeader *header;
-                       
-                       header = tny_msg_get_header (TNY_MSG (part));
-                       if (TNY_IS_HEADER (header)) {
-                               filename = g_strdup (tny_mime_part_get_filename (part));
-                               if (!filename)
-                                       filename = tny_header_dup_subject (header);
-                               if (filename == NULL || filename[0] == '\0')
-                                       filename = g_strdup (_("mail_va_no_subject"));
-                       }
-               } else {
+               /* Embbeded messages are not offered to be saved */
+               if (!TNY_IS_MSG (part)) {
+                       gchar *label;
+                       gchar *filename = NULL;
+
                        filename = g_strdup (tny_mime_part_get_filename (part));
+                       label = g_strconcat (filename, NULL);
+                       gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+                       gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, label, 1, part, -1);
+                       g_free (label);
+                       g_object_unref (part);
                }
-
-               label = g_strconcat (filename, NULL);
-               gtk_list_store_append (GTK_LIST_STORE (model), &iter);
-               gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, label, 1, part, -1);
-               g_free (label);
-               g_object_unref (part);
        }
 
        selector = GTK_WIDGET (hildon_touch_selector_new ());

diff --git a/src/hildon2/modest-msg-view-window.c b/src/hildon2/modest-msg-view-window.c
index 8945db1..edfb41d 100644 (file)
--- a/src/hildon2/modest-msg-view-window.c
+++ b/src/hildon2/modest-msg-view-window.c
@@ -2801,7 +2801,7 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, TnyList *m
                save_multiple_str = g_strdup_printf (_FM("sfil_va_number_of_objects_attachments"), 
                                                     tny_list_get_length (mime_parts));
        }
-       
+
        save_dialog = hildon_file_chooser_dialog_new (GTK_WINDOW (window), 
                                                      GTK_FILE_CHOOSER_ACTION_SAVE);