#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);
}
- /* Set date sent (optional) */
+ /* 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);
+ }
+
+ /* 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);
}
-
+
/* 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)
TnyFolder *folder)
{
TnyFolderStats *stats;
- gchar *count = NULL, *size_s = NULL, *name = NULL;
+ gchar *count, *size_s, *name = NULL;
gint size;
/* Set window title */
/* 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));
- } else {
+ }
+
+ 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);