hildon_banner_... changed to modest_platform_...

[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 5c6ee60..3875202 100644 (file)
--- a/src/widgets/modest-mail-header-view.c
+++ b/src/widgets/modest-mail-header-view.c
@@ -262,7 +262,7 @@ modest_mail_header_view_set_header_default (TnyHeaderView *self, TnyHeader *head
 
                priv->subject_box = gtk_hbox_new (FALSE, 0);
                subject_label = gtk_label_new (NULL);
-               if (subject)
+               if (subject && (subject[0] != '\0'))
                        gtk_label_set_text (GTK_LABEL (subject_label), subject);
                else
                        gtk_label_set_text (GTK_LABEL (subject_label), _("mail_va_no_subject"));
@@ -300,12 +300,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,7 +588,7 @@ 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_HIGH_PRIORITY);
+       priv->priority_flags = flags & (TNY_HEADER_FLAG_PRIORITY);
 
        if (priv->priority_flags == 0) {
                if (priv->priority_icon != NULL) {