* src/widgets/modest-details-dialog.c:

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

diff --git a/src/widgets/modest-details-dialog.c b/src/widgets/modest-details-dialog.c
index ca73139..68de19c 100644 (file)
--- a/src/widgets/modest-details-dialog.c
+++ b/src/widgets/modest-details-dialog.c
@@ -190,7 +190,9 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self,
        gchar *size_s;
        TnyFolder *folder;
        TnyFolderType folder_type;
-
+#define DATE_TIME_BUFFER_SIZE 128
+       gchar date_time_buffer [DATE_TIME_BUFFER_SIZE];
+       
        /* Set window title & Add close button */
        gtk_window_set_title (GTK_WINDOW (self), _("mcen_ti_message_properties"));
        gtk_dialog_add_button (GTK_DIALOG (self), _("mcen_bd_close"), GTK_RESPONSE_CLOSE);
@@ -222,28 +224,41 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self,
        modest_details_dialog_add_data (self, _("mcen_fi_message_properties_subject"), subject);
 
        /* Set received (optional) */
-       if ((folder_type != TNY_FOLDER_TYPE_SENT) &&
+       if (received && (folder_type != TNY_FOLDER_TYPE_SENT) &&
            (folder_type != TNY_FOLDER_TYPE_DRAFTS) &&
            (folder_type != TNY_FOLDER_TYPE_OUTBOX)) {
-               gchar *received_s;
 
-               received_s = modest_text_utils_get_display_date (received);
-               if (received_s == NULL)
-                       received_s = g_strdup (received_s);
-               modest_details_dialog_add_data (self, _("mcen_fi_message_properties_received"), received_s);
-               g_free (received_s);
+               modest_text_utils_strftime (date_time_buffer, DATE_TIME_BUFFER_SIZE, "%x %X",
+                                           received);
+               modest_details_dialog_add_data (self, _("mcen_fi_message_properties_received"),
+                                               date_time_buffer);
+               modest_text_utils_strftime (date_time_buffer, DATE_TIME_BUFFER_SIZE, "%x %X",
+                                           sent);
+               modest_details_dialog_add_data (self, _("mcen_fi_message_properties_created"),
+                                               date_time_buffer);
        }
 
+       if (sent && (folder_type == TNY_FOLDER_TYPE_SENT)) {
+               modest_text_utils_strftime (date_time_buffer, DATE_TIME_BUFFER_SIZE, "%x %X",
+                                           received);
+               modest_details_dialog_add_data (self, _("mcen_fi_message_properties_created"),
+                                               date_time_buffer);
+       }
        /* Set date sent (optional) */
-       if ((folder_type != TNY_FOLDER_TYPE_DRAFTS)&&
+       if (sent && (folder_type != TNY_FOLDER_TYPE_DRAFTS)&&
            (folder_type != TNY_FOLDER_TYPE_OUTBOX)) {
-               gchar *sent_s;
 
-               sent_s = modest_text_utils_get_display_date (sent);
-               if (sent_s == NULL)
-                       sent_s = g_strdup (sent_s);
-               modest_details_dialog_add_data (self, _("mcen_fi_message_properties_sent"), sent_s);
-               g_free (sent_s);
+               modest_text_utils_strftime (date_time_buffer, DATE_TIME_BUFFER_SIZE, "%x %X",
+                                           sent);
+               modest_details_dialog_add_data (self, _("mcen_fi_message_properties_sent"),
+                                               date_time_buffer);
+       }
+
+       if ((folder_type == TNY_FOLDER_TYPE_DRAFTS)|| (folder_type == TNY_FOLDER_TYPE_OUTBOX)) {
+               modest_text_utils_strftime (date_time_buffer, DATE_TIME_BUFFER_SIZE, "%x %X",
+                                           received);
+               modest_details_dialog_add_data (self, _("mcen_fi_message_properties_created"),
+                                               date_time_buffer);
        }
 
        /* Set To and CC */
@@ -251,7 +266,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)
+       if (size < 0)
                size_s = g_strdup (_("mcen_va_message_properties_size_noinfo"));
        else
                size_s = modest_text_utils_get_display_size (size);
@@ -270,12 +285,12 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self,
                                          TnyFolder *folder)
 {
        TnyFolderStats *stats;
-       gchar *count, *size_s;
+       gchar *count, *size_s, *name = NULL;
        gint size;
        
        /* Set window title */
        gtk_window_set_title (GTK_WINDOW (self), _("mcen_ti_folder_properties"));
-       gtk_dialog_add_button (GTK_DIALOG (self), _("mcen_bd_folder_properties_close"), GTK_RESPONSE_CLOSE);
+       gtk_dialog_add_button (GTK_DIALOG (self), _("mcen_bd_close"), GTK_RESPONSE_CLOSE);
 
        /* Get stats */
        stats = tny_folder_get_stats (folder);
@@ -287,12 +302,22 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self,
        else
                size_s = modest_text_utils_get_display_size (size);
 
-       modest_details_dialog_add_data (self, _("mcen_fi_folder_properties_foldername"), 
-                                       tny_folder_get_name (folder));
+       /* Different names for the local folders */
+       if (modest_tny_folder_is_local_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));
+
+       modest_details_dialog_add_data (self, _("mcen_fi_folder_properties_foldername"), name);
        modest_details_dialog_add_data (self, _("mcen_fi_folder_properties_messages"), count);
        modest_details_dialog_add_data (self, _("mcen_fi_folder_properties_size"), size_s);
 
        /* Frees */
+       g_free (name);
        g_free (size_s);
        g_free (count);
        g_object_unref (stats);