* Fixes NB#80917, added wimax support
[modest] / src / widgets / modest-details-dialog.c
index 1400192..a728bb6 100644 (file)
@@ -286,9 +286,9 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self,
                                          TnyFolder *folder)
 {
        gchar *count_s, *size_s, *name = NULL;
+       gchar *tmp = NULL;
        gint 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);
@@ -298,12 +298,12 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self,
        gtk_dialog_add_button (GTK_DIALOG (self), _("mcen_bd_close"), GTK_RESPONSE_CLOSE);
 
        /* Get data. We use our function because it's recursive */
-       if (TNY_IS_FOLDER_STORE (folder)) {
-               count = modest_tny_folder_store_get_message_count (TNY_FOLDER_STORE (folder));
-               size = modest_tny_folder_store_get_local_size (TNY_FOLDER_STORE (folder));
-       } else {
+       if (TNY_IS_FOLDER (folder)) {
                count = tny_folder_get_all_count (TNY_FOLDER (folder));
                size = tny_folder_get_local_size (TNY_FOLDER (folder));
+       } else {
+               count = modest_tny_folder_store_get_message_count (TNY_FOLDER_STORE (folder));
+               size = modest_tny_folder_store_get_local_size (TNY_FOLDER_STORE (folder));
        }
 
        /* Format count and size */
@@ -323,9 +323,17 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self,
        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_s);
-       modest_details_dialog_add_data (self, _("mcen_fi_folder_properties_size"), size_s);
+       tmp = g_strconcat (_("mcen_fi_folder_properties_foldername"), ":", NULL);
+       modest_details_dialog_add_data (self, tmp, name);
+       g_free (tmp);
+
+       tmp = g_strconcat (_("mcen_fi_folder_properties_messages"), ":", NULL);
+       modest_details_dialog_add_data (self, tmp, count_s);
+       g_free (tmp);
+
+       tmp = g_strconcat (_("mcen_fi_folder_properties_size"), ":", NULL);
+       modest_details_dialog_add_data (self, tmp, size_s);
+       g_free (tmp);
 
        /* Frees */
        g_free (name);