Typo in no subject translation in details dialog (fixes NB#108705)

[modest] / src / widgets / modest-details-dialog.c

diff --git a/src/widgets/modest-details-dialog.c b/src/widgets/modest-details-dialog.c
index c8b4d16..732c59f 100644 (file)
--- a/src/widgets/modest-details-dialog.c
+++ b/src/widgets/modest-details-dialog.c
@@ -195,7 +195,7 @@ 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;
@@ -205,21 +205,26 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self,
        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);
@@ -233,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);
@@ -242,16 +252,16 @@ 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)) {
-               date_time_str = modest_datetime_formatter_display_datetime (datetime_formatter, 
+               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_str);
        }
 
        /* for drafts (created) */
        if (folder_type == TNY_FOLDER_TYPE_DRAFTS) {
-               date_time_str = modest_datetime_formatter_display_datetime (datetime_formatter, 
+               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_str);
@@ -261,12 +271,12 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self,
        if (sent && (folder_type != TNY_FOLDER_TYPE_DRAFTS)&&
            (folder_type != TNY_FOLDER_TYPE_OUTBOX)) {
                
-               date_time_str = modest_datetime_formatter_display_datetime (datetime_formatter, 
+               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_str);
        }
-       
+
        /* Set To and CC */
        modest_details_dialog_add_data (self, _("mcen_fi_message_properties_to"), to);
 
@@ -274,11 +284,12 @@ 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);
 
@@ -288,6 +299,7 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self,
        g_free (from);
        g_free (subject);
        g_free (cc);
+       g_free (bcc);
 }
 
 static void
@@ -296,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"));
 
@@ -311,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) ||