X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-mail-header-view.c;h=d12532215384164925b8f08daa62035d1f01b2f7;hb=390e57914b5c73ff09fe1365ebc662b52a4ce5b7;hp=3875202c871a6a5ecfa2a7e0c3c80fa5a150c982;hpb=b86d095b771be078b8355d80790f5211970671f3;p=modest

diff --git a/src/widgets/modest-mail-header-view.c b/src/widgets/modest-mail-header-view.c
index 3875202..d125322 100644
--- 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);
 }
 
@@ -207,12 +208,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 +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); */
 /* 		} */
@@ -450,6 +446,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);
@@ -588,9 +585,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;