* Fixes a warning, the selected item in folder view could be a folder store

[modest] / src / widgets / modest-details-dialog.c

diff --git a/src/widgets/modest-details-dialog.c b/src/widgets/modest-details-dialog.c
index e3b7278..5e578c0 100644 (file)
--- a/src/widgets/modest-details-dialog.c
+++ b/src/widgets/modest-details-dialog.c
@@ -207,10 +207,10 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self,
        g_return_if_fail (folder_type != TNY_FOLDER_TYPE_INVALID);
        
        /* Get header data */
-       from = g_strdup (tny_header_get_from (header));
-       to = g_strdup (tny_header_get_to (header));
-       subject = g_strdup (tny_header_get_subject (header));
-       cc = g_strdup (tny_header_get_cc (header));
+       from = tny_header_dup_from (header);
+       to = tny_header_dup_to (header);
+       subject = tny_header_dup_subject (header);
+       cc = tny_header_dup_cc (header);
        received = tny_header_get_date_received (header);
        sent = tny_header_get_date_sent (header);
        size = tny_header_get_message_size (header);
@@ -315,14 +315,19 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self,
                size_s = modest_text_utils_get_display_size (size);
 
        /* Different names for the local folders */
-       if (modest_tny_folder_is_local_folder (folder)) {
+       if (modest_tny_folder_is_local_folder (folder) ||
+           modest_tny_folder_is_memory_card_folder (folder)) {
                gint type = modest_tny_folder_get_local_or_mmc_folder_type (folder);
                if (type != TNY_FOLDER_TYPE_UNKNOWN)
                        name = g_strdup(modest_local_folder_info_get_type_display_name (type));
-       } 
+       }
 
-       if (!name)      
-               name = g_strdup (tny_folder_get_name (folder));
+       if (!name) {
+               if (tny_folder_get_folder_type (folder) == TNY_FOLDER_TYPE_INBOX)
+                       name = g_strdup (_("mcen_me_folder_inbox"));
+               else
+                       name = g_strdup (tny_folder_get_name (folder));
+       }
 
        tmp = g_strconcat (_("mcen_fi_folder_properties_foldername"), ":", NULL);
        modest_details_dialog_add_data (self, tmp, name);