X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-details-dialog.c;h=140019256ae8d1a2476e416d36b8546e966bf3a3;hb=62b2744caac1ec1fd692dddde4fe33397e9ce0fe;hp=42c8c4e8a9433c49b3c5b892605a3a94b4f845a1;hpb=51d27f5ec40e7f91c13e5d51827ff8b89dd8cc4d;p=modest

diff --git a/src/widgets/modest-details-dialog.c b/src/widgets/modest-details-dialog.c
index 42c8c4e..1400192 100644
--- a/src/widgets/modest-details-dialog.c
+++ b/src/widgets/modest-details-dialog.c
@@ -37,8 +37,9 @@
 #include <tny-msg.h>
 #include <tny-header.h>
 #include <tny-header-view.h>
-#include <tny-folder-stats.h>
+#include <tny-folder-store.h>
 #include <modest-tny-folder.h>
+#include <modest-tny-account.h>
 #include <modest-text-utils.h>
 #include <string.h> /* for strlen */
 
@@ -161,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);
 
@@ -201,6 +203,8 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self,
 	folder_type = modest_tny_folder_guess_folder_type (folder);
 	g_object_unref (folder);
 
+	g_return_if_fail (folder_type != TNY_FOLDER_TYPE_INVALID);
+	
 	/* Get header data */
 	from = g_strdup (tny_header_get_from (header));
 	to = g_strdup (tny_header_get_to (header));
@@ -281,19 +285,29 @@ static void
 modest_details_dialog_set_folder_default (ModestDetailsDialog *self,
 					  TnyFolder *folder)
 {
-	TnyFolderStats *stats;
-	gchar *count, *size_s, *name = NULL;
-	gint size;
+	gchar *count_s, *size_s, *name = 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);
 	
 	/* 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 stats */
-	stats = tny_folder_get_stats (folder);
-	count = g_strdup_printf ("%d", tny_folder_stats_get_all_count (stats));
-	/* Format the size */
-	size = tny_folder_stats_get_local_size (stats);
+	/* 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 {
+		count = tny_folder_get_all_count (TNY_FOLDER (folder));
+		size = tny_folder_get_local_size (TNY_FOLDER (folder));
+	}
+
+	/* 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
@@ -310,14 +324,13 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self,
 		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_messages"), count_s);
 	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);
+	g_free (count_s);
 }
 
 static void