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

pmo-trunk-r7086

diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index bb4da39..7f06a99 100644 (file)
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -1629,9 +1629,7 @@ modest_text_utils_get_display_size (guint64 size)
        const guint MB=1024 * KB;
        const guint GB=1024 * MB;
 
        const guint MB=1024 * KB;
        const guint GB=1024 * MB;
 

-       if (size == 0)
-               return g_strdup_printf(_FM("sfil_li_size_kb"), 0);
-       if (0 < size && size < KB)
+       if (0 <= size && size < KB)

                return g_strdup_printf (_FM("sfil_li_size_kb"), 1);
        else if (KB <= size && size < 100 * KB)
                return g_strdup_printf (_FM("sfil_li_size_1kb_99kb"), size / KB);
                return g_strdup_printf (_FM("sfil_li_size_kb"), 1);
        else if (KB <= size && size < 100 * KB)
                return g_strdup_printf (_FM("sfil_li_size_1kb_99kb"), size / KB);

diff --git a/src/widgets/modest-details-dialog.c b/src/widgets/modest-details-dialog.c
index 35e8a9a..f60a829 100644 (file)
--- a/src/widgets/modest-details-dialog.c
+++ b/src/widgets/modest-details-dialog.c
@@ -266,7 +266,7 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self,
                modest_details_dialog_add_data (self, _("mcen_fi_message_properties_sent"),
                                                date_time_str);
        }
                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);
 
        /* Set To and CC */
        modest_details_dialog_add_data (self, _("mcen_fi_message_properties_to"), to);
 

@@ -275,10 +275,7 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self,
                modest_details_dialog_add_data (self, _("mcen_fi_message_properties_cc"), cc);
 
        /* Set size */
                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);
 
        modest_details_dialog_add_data (self, _("mcen_fi_message_properties_size"), size_s);
        g_free (size_s);
 

@@ -296,12 +293,12 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self,
 {
        gchar *count_s, *size_s, *name = NULL;
        gchar *tmp = NULL;
 {
        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);
 
        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"));
 
        /* Set window title */
        gtk_window_set_title (GTK_WINDOW (self), _("mcen_ti_folder_properties"));
 

@@ -311,10 +308,7 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self,
 
        /* Format count and size */
        count_s = g_strdup_printf ("%d", count);
 
        /* 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) ||
 
        /* Different names for the local folders */
        if (modest_tny_folder_is_local_folder (folder) ||