Do not show "mark as (un)read" for messages sent as attachments

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

diff --git a/src/widgets/modest-details-dialog.c b/src/widgets/modest-details-dialog.c
index c8b4d16..5bb6dae 100644 (file)
--- a/src/widgets/modest-details-dialog.c
+++ b/src/widgets/modest-details-dialog.c
@@ -210,8 +210,12 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self,
        gtk_window_set_title (GTK_WINDOW (self), _("mcen_ti_message_properties"));
 
        folder = tny_header_get_folder (header);
-       folder_type = modest_tny_folder_guess_folder_type (folder);
-       g_object_unref (folder);
+       if (folder) {
+               folder_type = modest_tny_folder_guess_folder_type (folder);
+               g_object_unref (folder);
+       } else {
+               folder_type = TNY_FOLDER_TYPE_NORMAL;
+       }
 
        g_return_if_fail (folder_type != TNY_FOLDER_TYPE_INVALID);
        
@@ -242,7 +246,7 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self,
        if (received && (folder_type != TNY_FOLDER_TYPE_SENT) &&
            (folder_type != TNY_FOLDER_TYPE_DRAFTS) &&
            (folder_type != TNY_FOLDER_TYPE_OUTBOX)) {
-               date_time_str = modest_datetime_formatter_display_datetime (datetime_formatter, 
+               date_time_str = modest_datetime_formatter_display_long_datetime (datetime_formatter, 
                                                                            received);
                
                modest_details_dialog_add_data (self, _("mcen_fi_message_properties_received"),
@@ -251,7 +255,7 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self,
 
        /* for drafts (created) */
        if (folder_type == TNY_FOLDER_TYPE_DRAFTS) {
-               date_time_str = modest_datetime_formatter_display_datetime (datetime_formatter, 
+               date_time_str = modest_datetime_formatter_display_long_datetime (datetime_formatter, 
                                                                            received);
                modest_details_dialog_add_data (self, _("mcen_fi_message_properties_created"),
                                                date_time_str);
@@ -261,12 +265,12 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self,
        if (sent && (folder_type != TNY_FOLDER_TYPE_DRAFTS)&&
            (folder_type != TNY_FOLDER_TYPE_OUTBOX)) {
                
-               date_time_str = modest_datetime_formatter_display_datetime (datetime_formatter, 
+               date_time_str = modest_datetime_formatter_display_long_datetime (datetime_formatter, 
                                                                            sent);
                modest_details_dialog_add_data (self, _("mcen_fi_message_properties_sent"),
                                                date_time_str);
        }
-       
+
        /* Set To and CC */
        modest_details_dialog_add_data (self, _("mcen_fi_message_properties_to"), to);
 
@@ -275,10 +279,7 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self,
                modest_details_dialog_add_data (self, _("mcen_fi_message_properties_cc"), cc);
 
        /* Set size */
-       if (size <= 0)
-               size_s = g_strdup (_("mcen_va_message_properties_size_noinfo"));
-       else
-               size_s = modest_text_utils_get_display_size (size);
+       size_s = modest_text_utils_get_display_size (size);
        modest_details_dialog_add_data (self, _("mcen_fi_message_properties_size"), size_s);
        g_free (size_s);
 
@@ -296,12 +297,12 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self,
 {
        gchar *count_s, *size_s, *name = NULL;
        gchar *tmp = NULL;
-       gint size, count;
+       guint size, count;
 
        g_return_if_fail (folder && TNY_IS_FOLDER (folder));
        g_return_if_fail (modest_tny_folder_guess_folder_type (folder)
                          != TNY_FOLDER_TYPE_INVALID);
-       
+
        /* Set window title */
        gtk_window_set_title (GTK_WINDOW (self), _("mcen_ti_folder_properties"));
 
@@ -311,10 +312,7 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self,
 
        /* Format count and size */
        count_s = g_strdup_printf ("%d", count);
-       if (size <= 0)
-               size_s = g_strdup (_("mcen_va_message_properties_size_noinfo"));
-       else
-               size_s = modest_text_utils_get_display_size (size);
+       size_s = modest_text_utils_get_display_size (size);
 
        /* Different names for the local folders */
        if (modest_tny_folder_is_local_folder (folder) ||