X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-details-dialog.c;h=732c59fc557903e5c2f9c681f058850f11f9863e;hp=9a14c10dc8b3ab706eac04b06dc03be2dff4075c;hb=14ceb689170405d1176e9916f6e3e03cf4bc4ab5;hpb=564a7388a2f74368147b0a241ca4a0b65c68167f diff --git a/src/widgets/modest-details-dialog.c b/src/widgets/modest-details-dialog.c index 9a14c10..732c59f 100644 --- a/src/widgets/modest-details-dialog.c +++ b/src/widgets/modest-details-dialog.c @@ -42,6 +42,7 @@ #include #include #include +#include #include /* for strlen */ static void modest_details_dialog_set_header_default (ModestDetailsDialog *self, @@ -95,7 +96,6 @@ modest_details_dialog_class_init (ModestDetailsDialogClass *klass) static void modest_details_dialog_init (ModestDetailsDialog *self) { - MODEST_DETAILS_DIALOG_GET_CLASS (self)->create_container_func (self); } GtkWidget* @@ -111,6 +111,7 @@ modest_details_dialog_new_with_header (GtkWindow *parent, "transient-for", parent, NULL)); + MODEST_DETAILS_DIALOG_GET_CLASS (dialog)->create_container_func (dialog); MODEST_DETAILS_DIALOG_GET_CLASS (dialog)->set_header_func (dialog, header); /* Add close button */ @@ -132,6 +133,7 @@ modest_details_dialog_new_with_folder (GtkWindow *parent, "transient-for", parent, NULL)); + MODEST_DETAILS_DIALOG_GET_CLASS (dialog)->create_container_func (dialog); MODEST_DETAILS_DIALOG_GET_CLASS (dialog)->set_folder_func (dialog, folder); /* Add close button */ @@ -193,29 +195,36 @@ static void modest_details_dialog_set_header_default (ModestDetailsDialog *self, TnyHeader *header) { - gchar *from, *subject, *to, *cc; + gchar *from = NULL, *subject = NULL, *to = NULL, *cc = NULL, *bcc = NULL; time_t received, sent; guint size; gchar *size_s; TnyFolder *folder; TnyFolderType folder_type; -#define DATE_TIME_BUFFER_SIZE 128 - gchar date_time_buffer [DATE_TIME_BUFFER_SIZE]; - + ModestDatetimeFormatter *datetime_formatter; + const gchar *date_time_str; + + datetime_formatter = modest_datetime_formatter_new (); + /* Set window title */ gtk_window_set_title (GTK_WINDOW (self), _("mcen_ti_message_properties")); folder = tny_header_get_folder (header); - folder_type = modest_tny_folder_guess_folder_type (folder); - g_object_unref (folder); + if (folder) { + folder_type = modest_tny_folder_guess_folder_type (folder); + g_object_unref (folder); + } else { + folder_type = TNY_FOLDER_TYPE_NORMAL; + } g_return_if_fail (folder_type != TNY_FOLDER_TYPE_INVALID); - + /* Get header data */ from = tny_header_dup_from (header); to = tny_header_dup_to (header); subject = tny_header_dup_subject (header); cc = tny_header_dup_cc (header); + bcc = tny_header_dup_bcc (header); received = tny_header_get_date_received (header); sent = tny_header_get_date_sent (header); size = tny_header_get_message_size (header); @@ -229,6 +238,11 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self, if (cc == NULL) cc = g_strdup (""); + if (!strcmp (subject, "")) { + g_free (subject); + subject = g_strdup (_("mail_va_no_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); @@ -238,31 +252,31 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self, 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); + date_time_str = modest_datetime_formatter_display_long_datetime (datetime_formatter, + received); + modest_details_dialog_add_data (self, _("mcen_fi_message_properties_received"), - date_time_buffer); + date_time_str); } /* for drafts (created) */ if (folder_type == TNY_FOLDER_TYPE_DRAFTS) { - modest_text_utils_strftime (date_time_buffer, DATE_TIME_BUFFER_SIZE, "%x %X", - received); + date_time_str = modest_datetime_formatter_display_long_datetime (datetime_formatter, + received); modest_details_dialog_add_data (self, _("mcen_fi_message_properties_created"), - date_time_buffer); + date_time_str); } /* 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); + date_time_str = modest_datetime_formatter_display_long_datetime (datetime_formatter, + sent); modest_details_dialog_add_data (self, _("mcen_fi_message_properties_sent"), - date_time_buffer); + date_time_str); } - + /* Set To and CC */ modest_details_dialog_add_data (self, _("mcen_fi_message_properties_to"), to); @@ -270,19 +284,22 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self, if (cc && strlen(cc) > 0) modest_details_dialog_add_data (self, _("mcen_fi_message_properties_cc"), cc); + /* only show cc when it's there */ + if (bcc && strlen(bcc) > 0) + modest_details_dialog_add_data (self, _("mcen_fi_message_properties_bcc"), bcc); + /* Set size */ - if (size <= 0) - size_s = g_strdup (_("mcen_va_message_properties_size_noinfo")); - else - size_s = modest_text_utils_get_display_size (size); + size_s = modest_text_utils_get_display_size (size); modest_details_dialog_add_data (self, _("mcen_fi_message_properties_size"), size_s); g_free (size_s); /* Frees */ + g_object_unref (datetime_formatter); g_free (to); g_free (from); g_free (subject); g_free (cc); + g_free (bcc); } static void @@ -291,12 +308,12 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self, { gchar *count_s, *size_s, *name = NULL; gchar *tmp = NULL; - gint size, count; + guint 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")); @@ -306,10 +323,7 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self, /* 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 - size_s = modest_text_utils_get_display_size (size); + size_s = modest_text_utils_get_display_size (size); /* Different names for the local folders */ if (modest_tny_folder_is_local_folder (folder) ||