* Changes in the autotools stuff affecting a lot of platform dependent

[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 a91d79d..7a9ad29 100644 (file)
--- a/src/widgets/modest-mail-header-view.c
+++ b/src/widgets/modest-mail-header-view.c
@@ -170,6 +170,7 @@ add_recpt_header (ModestMailHeaderView *widget, const gchar *field, const gchar
        gtk_size_group_add_widget (priv->labels_size_group, label_field);
        
        gtk_box_pack_start (GTK_BOX (priv->headers_vbox), hbox, FALSE, FALSE, 0);
+
        gtk_widget_show (hbox);
 }
 
@@ -240,7 +241,7 @@ modest_mail_header_view_set_header_default (TnyHeaderView *self, TnyHeader *head
 
        if (header && G_IS_OBJECT (header))
        {
-               const gchar *to, *from, *subject, *bcc, *cc;
+               gchar *to, *from, *subject, *bcc, *cc;
                GtkWidget *subject_label;
 
                g_object_ref (G_OBJECT (header)); 
@@ -249,11 +250,11 @@ modest_mail_header_view_set_header_default (TnyHeaderView *self, TnyHeader *head
                modest_mail_header_view_update_is_outgoing (self);
 
 
-               to = tny_header_get_to (header);
-               from = tny_header_get_from (header);
-               subject = tny_header_get_subject (header);
-               cc = tny_header_get_cc (header);
-               bcc = tny_header_get_bcc (header);
+               to = tny_header_dup_to (header);
+               from = tny_header_dup_from (header);
+               subject = tny_header_dup_subject (header);
+               cc = tny_header_dup_cc (header);
+               bcc = tny_header_dup_bcc (header);
 
                priv->subject_box = gtk_hbox_new (FALSE, 0);
                subject_label = gtk_label_new (NULL);
@@ -267,7 +268,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); */
 /*             } */
@@ -303,9 +304,14 @@ modest_mail_header_view_set_header_default (TnyHeaderView *self, TnyHeader *head
                                add_recpt_header (MODEST_MAIL_HEADER_VIEW (self), _("mail_va_hotfix1"), bcc);
                        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"),
+                       add_date_time_header (MODEST_MAIL_HEADER_VIEW (self), _("mail_va_date"),
                                              tny_header_get_date_received (header));
                }
+               g_free (subject);
+               g_free (to);
+               g_free (from);
+               g_free (cc);
+               g_free (bcc);
        }
 
        gtk_widget_show_all (GTK_WIDGET (self));
@@ -445,6 +451,7 @@ modest_mail_header_view_instance_init (GTypeInstance *instance, gpointer g_class
        gtk_size_group_add_widget (priv->labels_size_group, priv->fromto_label);
        
        priv->headers_vbox = gtk_vbox_new (FALSE, 0);
+       gtk_container_set_focus_chain (GTK_CONTAINER (priv->headers_vbox), NULL);
        g_object_ref (priv->headers_vbox);
 
        expander_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
@@ -487,8 +494,8 @@ tny_header_view_init (gpointer g, gpointer iface_data)
 {
        TnyHeaderViewIface *klass = (TnyHeaderViewIface *)g;
 
-       klass->set_header_func = modest_mail_header_view_set_header;
-       klass->clear_func = modest_mail_header_view_clear;
+       klass->set_header = modest_mail_header_view_set_header;
+       klass->clear = modest_mail_header_view_clear;
 
        return;
 }
@@ -583,7 +590,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_PRIORITY);
+       priv->priority_flags = flags & TNY_HEADER_FLAG_PRIORITY_MASK ;
 
        if (priv->priority_flags == TNY_HEADER_FLAG_NORMAL_PRIORITY) {
                if (priv->priority_icon != NULL) {