X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-details-dialog.c;h=a728bb6510766c8c38e49c3d23ed8582c4ac9f36;hb=cedfa856e9f7aef20b4caed2707ffdfe36613fbd;hp=3a8ec1c65a57d0f189ce13e0fc6ced14f65a4297;hpb=9373a406dc6ac62a374958051d1f72b7bff79642;p=modest

diff --git a/src/widgets/modest-details-dialog.c b/src/widgets/modest-details-dialog.c
index 3a8ec1c..a728bb6 100644
--- a/src/widgets/modest-details-dialog.c
+++ b/src/widgets/modest-details-dialog.c
@@ -162,6 +162,7 @@ modest_details_dialog_add_data_default (ModestDetailsDialog *self,
 	/* Create value */
 	value_w = gtk_label_new (value);
 	gtk_label_set_line_wrap (GTK_LABEL (value_w), TRUE);
+	gtk_label_set_line_wrap_mode (GTK_LABEL (value_w), PANGO_WRAP_WORD_CHAR);
 	gtk_misc_set_alignment (GTK_MISC (value_w), 0.0, 0.0);
 	gtk_label_set_justify (GTK_LABEL (value_w), GTK_JUSTIFY_LEFT);
 
@@ -285,11 +286,11 @@ 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_get_local_or_mmc_folder_type (folder)
+	g_return_if_fail (modest_tny_folder_guess_folder_type (folder)
 			  != TNY_FOLDER_TYPE_INVALID);
 	
 	/* Set window title */
@@ -297,8 +298,13 @@ 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 */
-	count = modest_tny_folder_store_get_message_count (TNY_FOLDER_STORE (folder));
-	size = modest_tny_folder_store_get_local_size (TNY_FOLDER_STORE (folder));
+	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 */
 	count_s = g_strdup_printf ("%d", count);
@@ -317,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);