* update the en_GB.po file with the newest translations

[modest] / src / widgets / modest-mail-header-view.c

diff --git a/src/widgets/modest-mail-header-view.c b/src/widgets/modest-mail-header-view.c
index 1239644..ddaa91a 100644 (file)
--- a/src/widgets/modest-mail-header-view.c
+++ b/src/widgets/modest-mail-header-view.c
@@ -207,12 +207,7 @@ modest_mail_header_view_update_is_outgoing (TnyHeaderView *self)
        folder = tny_header_get_folder (priv->header);
 
        if (folder) {
-               TnyFolderType folder_type;
-               folder_type = tny_folder_get_folder_type (folder);
-               if (folder_type == TNY_FOLDER_TYPE_NORMAL || folder_type == TNY_FOLDER_TYPE_UNKNOWN) {
-                       const gchar *fname = tny_folder_get_name (folder);
-                       folder_type = modest_tny_folder_guess_folder_type_from_name (fname);
-               }
+               TnyFolderType folder_type = tny_folder_get_folder_type (folder);
 
                switch (folder_type) {
                case TNY_FOLDER_TYPE_DRAFTS:
@@ -272,7 +267,7 @@ modest_mail_header_view_set_header_default (TnyHeaderView *self, TnyHeader *head
                gtk_misc_set_alignment (GTK_MISC (subject_label), 0.0, 0.0);
 
                /* TODO: code disabled until we can get real priority information from message */
-/*             if (tny_header_get_flags (header) & TNY_HEADER_FLAG_PRIORITY) { */
+/*             if (tny_header_get_priority (header)) { */
 /*                     GtkWidget *priority_icon = gtk_image_new_from_icon_name ("qgn_list_messaging_high", GTK_ICON_SIZE_MENU); */
 /*                     gtk_box_pack_start (GTK_BOX (subject_box), priority_icon, FALSE, FALSE, 0); */
 /*             } */
@@ -300,12 +295,12 @@ modest_mail_header_view_set_header_default (TnyHeaderView *self, TnyHeader *head
                        gtk_label_set_markup (GTK_LABEL (priv->fromto_label), _("mail_va_from"));
                        if (from)
                                modest_recpt_view_set_recipients (MODEST_RECPT_VIEW (priv->fromto_contents), from);
+                       if (to)
+                               add_recpt_header (MODEST_MAIL_HEADER_VIEW (self), _("mail_va_to"), to);
                        if (cc)
                                add_recpt_header (MODEST_MAIL_HEADER_VIEW (self), _("mail_va_cc"), cc);
                        if (bcc)
                                add_recpt_header (MODEST_MAIL_HEADER_VIEW (self), _("mail_va_hotfix1"), bcc);
-                       if (to)
-                               add_recpt_header (MODEST_MAIL_HEADER_VIEW (self), _("mail_va_to"), to);
                        modest_mail_header_view_add_custom_header (MODEST_MAIL_HEADER_VIEW (self), _("mail_va_subject"),
                                                                   priv->subject_box, TRUE, TRUE);
                        add_date_time_header (MODEST_MAIL_HEADER_VIEW (self), _("mcen_fi_message_properties_received"),
@@ -588,9 +583,9 @@ modest_mail_header_view_set_priority (ModestMailHeaderView *headers_view,
        g_return_if_fail (MODEST_IS_MAIL_HEADER_VIEW (headers_view));
        priv = MODEST_MAIL_HEADER_VIEW_GET_PRIVATE (headers_view);
 
-       priv->priority_flags = flags & (TNY_HEADER_FLAG_PRIORITY);
+       priv->priority_flags = flags & TNY_HEADER_FLAG_PRIORITY_MASK ;
 
-       if (priv->priority_flags == 0) {
+       if (priv->priority_flags == TNY_HEADER_FLAG_NORMAL_PRIORITY) {
                if (priv->priority_icon != NULL) {
                        gtk_widget_destroy (priv->priority_icon);
                        priv->priority_icon = NULL;