#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);
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);
- 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)) {
+ /* 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",
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);
}
-
- 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)
+ if (size <= 0)
size_s = g_strdup (_("mcen_va_message_properties_size_noinfo"));
else
size_s = modest_text_utils_get_display_size (size);