X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-details-dialog.c;h=42c8c4e8a9433c49b3c5b892605a3a94b4f845a1;hb=4d802a02db4815346954f71ca0cb11b51a16ec01;hp=21cff997778ef7eb0c4075d715364f69c45ec5cd;hpb=dafad623b1c0f184142ce09a51882fa967d7eb09;p=modest

diff --git a/src/widgets/modest-details-dialog.c b/src/widgets/modest-details-dialog.c
index 21cff99..42c8c4e 100644
--- a/src/widgets/modest-details-dialog.c
+++ b/src/widgets/modest-details-dialog.c
@@ -40,7 +40,7 @@
 #include <tny-folder-stats.h>
 #include <modest-tny-folder.h>
 #include <modest-text-utils.h>
-
+#include <string.h> /* for strlen */
 
 static void    modest_details_dialog_set_header_default          (ModestDetailsDialog *self,
 								  TnyHeader *header);
@@ -219,49 +219,48 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self,
 	if (cc == NULL)
 		cc = g_strdup ("");
 
-	/* Add from and subject */
+	/* Add from and subject for all folders */
 	modest_details_dialog_add_data (self, _("mcen_fi_message_properties_from"), from);
 	modest_details_dialog_add_data (self, _("mcen_fi_message_properties_subject"), subject);
 
-	/* Set received (optional) */
+
+	/* for inbox, user-created folders and archive: Received */
 	if (received && (folder_type != TNY_FOLDER_TYPE_SENT) &&
 	    (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_received"),
 						date_time_buffer);
+	}
+
+	/* for outbox, drafts: Modified: (_created) */
+	if ((folder_type == TNY_FOLDER_TYPE_DRAFTS) ||
+	    (folder_type == TNY_FOLDER_TYPE_OUTBOX) ||
+	    (folder_type == TNY_FOLDER_TYPE_SENT)) {
  		modest_text_utils_strftime (date_time_buffer, DATE_TIME_BUFFER_SIZE, "%x %X",
-					    sent);
+					    received);
 		modest_details_dialog_add_data (self, _("mcen_fi_message_properties_created"),
 						date_time_buffer);
 	}
 
-	/* Set date sent (optional) */
+	/* for everyting except outbox, drafts: Sent */
 	if (sent && (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",
 					    sent);
 		modest_details_dialog_add_data (self, _("mcen_fi_message_properties_sent"),
 						date_time_buffer);
- 		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);
-	}
-
-	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);
+
+	/* only show cc when it's there */
+	if (cc && strlen(cc) > 0)
+		modest_details_dialog_add_data (self, _("mcen_fi_message_properties_cc"), cc);
 
 	/* Set size */
 	if (size <= 0)
@@ -302,7 +301,7 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self,
 
 	/* Different names for the local folders */
 	if (modest_tny_folder_is_local_folder (folder)) {
-		gint type = modest_tny_folder_get_local_folder_type (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));
 	}