X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-details-dialog.c;h=68de19cb26a92f27052a1cda6890fa797598c22b;hp=51a00ed8f3f6953455fc366df23b10174cc31dea;hb=dc84efe84c22be9c1b6247a8ee29cfd1d675d21d;hpb=1eb201c8eb26a578b99c5a0c2f4c981405be8da0

diff --git a/src/widgets/modest-details-dialog.c b/src/widgets/modest-details-dialog.c
index 51a00ed..68de19c 100644
--- a/src/widgets/modest-details-dialog.c
+++ b/src/widgets/modest-details-dialog.c
@@ -232,8 +232,18 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self,
 					    received);
 		modest_details_dialog_add_data (self, _("mcen_fi_message_properties_received"),
 						date_time_buffer);
+ 		modest_text_utils_strftime (date_time_buffer, DATE_TIME_BUFFER_SIZE, "%x %X",
+					    sent);
+		modest_details_dialog_add_data (self, _("mcen_fi_message_properties_created"),
+						date_time_buffer);
 	}
 
+	if (sent && (folder_type == TNY_FOLDER_TYPE_SENT)) {
+ 		modest_text_utils_strftime (date_time_buffer, DATE_TIME_BUFFER_SIZE, "%x %X",
+					    received);
+		modest_details_dialog_add_data (self, _("mcen_fi_message_properties_created"),
+						date_time_buffer);
+	}
 	/* Set date sent (optional) */
 	if (sent && (folder_type != TNY_FOLDER_TYPE_DRAFTS)&&
 	    (folder_type != TNY_FOLDER_TYPE_OUTBOX)) {
@@ -244,12 +254,19 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self,
 						date_time_buffer);
 	}
 
+	if ((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",
+					    received);
+		modest_details_dialog_add_data (self, _("mcen_fi_message_properties_created"),
+						date_time_buffer);
+	}
+
 	/* Set To and CC */
 	modest_details_dialog_add_data (self, _("mcen_fi_message_properties_to"), to);
 	modest_details_dialog_add_data (self, _("mcen_fi_message_properties_cc"), cc);
 
 	/* Set size */
-	if (size <= 0)
+	if (size < 0)
 		size_s = g_strdup (_("mcen_va_message_properties_size_noinfo"));
 	else
 		size_s = modest_text_utils_get_display_size (size);
@@ -268,12 +285,12 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self,
 					  TnyFolder *folder)
 {
 	TnyFolderStats *stats;
-	gchar *count, *size_s;
+	gchar *count, *size_s, *name = NULL;
 	gint size;
 	
 	/* Set window title */
 	gtk_window_set_title (GTK_WINDOW (self), _("mcen_ti_folder_properties"));
-	gtk_dialog_add_button (GTK_DIALOG (self), _("mcen_bd_folder_properties_close"), GTK_RESPONSE_CLOSE);
+	gtk_dialog_add_button (GTK_DIALOG (self), _("mcen_bd_close"), GTK_RESPONSE_CLOSE);
 
 	/* Get stats */
 	stats = tny_folder_get_stats (folder);
@@ -285,12 +302,22 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self,
 	else
 		size_s = modest_text_utils_get_display_size (size);
 
-	modest_details_dialog_add_data (self, _("mcen_fi_folder_properties_foldername"), 
-					tny_folder_get_name (folder));
+	/* Different names for the local folders */
+	if (modest_tny_folder_is_local_folder (folder)) {
+		gint type = modest_tny_folder_get_local_or_mmc_folder_type (folder);
+		if (type != TNY_FOLDER_TYPE_UNKNOWN)
+			name = g_strdup(modest_local_folder_info_get_type_display_name (type));
+	} 
+
+	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);
 	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);