Show Bcc in the message details whenever possible.

pmo-trunk-r7469

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 7f21072..5662273 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -4522,7 +4522,7 @@ modest_ui_actions_on_change_fullscreen (GtkAction *action,
  * Used by modest_ui_actions_on_details to call do_headers_action 
  */
 static void
-headers_action_show_details (TnyHeader *header, 
+headers_action_show_details (TnyHeader *header,
                             ModestWindow *window,
                             gpointer user_data)
 
@@ -4533,36 +4533,24 @@ headers_action_show_details (TnyHeader *header,
 /*
  * Show the header details in a ModestDetailsDialog widget
  */
-void     
-modest_ui_actions_on_details (GtkAction *action, 
+void
+modest_ui_actions_on_details (GtkAction *action,
                              ModestWindow *win)
 {
-       TnyList * headers_list;
-       TnyIterator *iter;
-       TnyHeader *header;              
-
        if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
                TnyMsg *msg;
+               TnyHeader *header;
 
                msg = modest_msg_view_window_get_message (MODEST_MSG_VIEW_WINDOW (win));
                if (!msg)
                        return;
-               g_object_unref (msg);           
 
-               headers_list = get_selected_headers (win);
-               if (!headers_list)
-                       return;
-
-               iter = tny_list_create_iterator (headers_list);
-
-               header = TNY_HEADER (tny_iterator_get_current (iter));
+               header = tny_msg_get_header (msg);
                if (header) {
                        headers_action_show_details (header, win, NULL);
                        g_object_unref (header);
                }
-
-               g_object_unref (iter);
-               g_object_unref (headers_list);
+               g_object_unref (msg);
 
        } else if (MODEST_IS_MAIN_WINDOW (win)) {
                GtkWidget *folder_view, *header_view;

diff --git a/src/widgets/modest-details-dialog.c b/src/widgets/modest-details-dialog.c
index 5bb6dae..8ec104d 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;
@@ -218,12 +218,13 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self,
        }
 
        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);
@@ -278,6 +279,10 @@ 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 */
        size_s = modest_text_utils_get_display_size (size);
        modest_details_dialog_add_data (self, _("mcen_fi_message_properties_size"), size_s);
@@ -289,6 +294,7 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self,
        g_free (from);
        g_free (subject);
        g_free (cc);
+       g_free (bcc);
 }
 
 static void