* Fixes NB#92465, show 1Kb when folder size is less than 1Kb

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

diff --git a/src/widgets/modest-details-dialog.c b/src/widgets/modest-details-dialog.c
index 2bee7fd..f60a829 100644 (file)
--- a/src/widgets/modest-details-dialog.c
+++ b/src/widgets/modest-details-dialog.c
@@ -42,6 +42,7 @@
 #include <modest-tny-folder.h>
 #include <modest-tny-account.h>
 #include <modest-text-utils.h>
+#include <modest-datetime-formatter.h>
 #include <string.h> /* for strlen */
 
 static void    modest_details_dialog_set_header_default          (ModestDetailsDialog *self,
@@ -95,7 +96,6 @@ modest_details_dialog_class_init (ModestDetailsDialogClass *klass)
 static void
 modest_details_dialog_init (ModestDetailsDialog *self)
 {
-       MODEST_DETAILS_DIALOG_GET_CLASS (self)->create_container_func (self);
 }
 
 GtkWidget*
@@ -111,8 +111,12 @@ modest_details_dialog_new_with_header (GtkWindow *parent,
                                                        "transient-for", parent, 
                                                        NULL));
 
+       MODEST_DETAILS_DIALOG_GET_CLASS (dialog)->create_container_func (dialog);
        MODEST_DETAILS_DIALOG_GET_CLASS (dialog)->set_header_func (dialog, header);
 
+       /* Add close button */
+       gtk_dialog_add_button (GTK_DIALOG (dialog), _("mcen_bd_close"), GTK_RESPONSE_CLOSE);
+
        return GTK_WIDGET (dialog);
 }
 
@@ -129,8 +133,12 @@ modest_details_dialog_new_with_folder  (GtkWindow *parent,
                                                        "transient-for", parent, 
                                                        NULL));
 
+       MODEST_DETAILS_DIALOG_GET_CLASS (dialog)->create_container_func (dialog);
        MODEST_DETAILS_DIALOG_GET_CLASS (dialog)->set_folder_func (dialog, folder);
 
+       /* Add close button */
+       gtk_dialog_add_button (GTK_DIALOG (dialog), _("mcen_bd_close"), GTK_RESPONSE_CLOSE);
+
        return GTK_WIDGET (dialog);
 }
 
@@ -193,12 +201,13 @@ 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];
+       ModestDatetimeFormatter *datetime_formatter;
+       const gchar *date_time_str;
+
+       datetime_formatter = modest_datetime_formatter_new ();
        
-       /* Set window title & Add close button */
+       /* Set window title */
        gtk_window_set_title (GTK_WINDOW (self), _("mcen_ti_message_properties"));
-       gtk_dialog_add_button (GTK_DIALOG (self), _("mcen_bd_close"), GTK_RESPONSE_CLOSE);
 
        folder = tny_header_get_folder (header);
        folder_type = modest_tny_folder_guess_folder_type (folder);
@@ -233,31 +242,31 @@ 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_long_datetime (datetime_formatter, 
+                                                                           received);
                
-               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);
+                                               date_time_str);
        }
 
        /* for drafts (created) */
        if (folder_type == TNY_FOLDER_TYPE_DRAFTS) {
-               modest_text_utils_strftime (date_time_buffer, DATE_TIME_BUFFER_SIZE, "%x %X",
-                                           received);
+               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_buffer);
+                                               date_time_str);
        }
 
        /* for everyting except outbox, drafts: Sent */
        if (sent && (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",
-                                           sent);
+               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_buffer);
+                                               date_time_str);
        }
-       
+
        /* Set To and CC */
        modest_details_dialog_add_data (self, _("mcen_fi_message_properties_to"), to);
 
@@ -266,14 +275,12 @@ 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);
 
        /* Frees */
+       g_object_unref (datetime_formatter);
        g_free (to);
        g_free (from);
        g_free (subject);
@@ -286,15 +293,14 @@ 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"));
-       gtk_dialog_add_button (GTK_DIALOG (self), _("mcen_bd_close"), GTK_RESPONSE_CLOSE);
 
        /* Get data. We use our function because it's recursive */
        count = tny_folder_get_all_count (TNY_FOLDER (folder));
@@ -302,10 +308,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) ||