* all:

[modest] / src / gtk / modest-main-window.c

diff --git a/src/gtk/modest-main-window.c b/src/gtk/modest-main-window.c
index de23147..e0a2730 100644 (file)
--- a/src/gtk/modest-main-window.c
+++ b/src/gtk/modest-main-window.c
@@ -261,43 +261,31 @@ modest_main_window_get_ui (ModestTnyFolderTreeView *folder_view,
 static GtkWidget*
 modest_main_window_header_tree (TnyMsgFolderIface *folder)
 {
-       GtkTreeViewColumn *column;
-       GtkCellRenderer *renderer = gtk_cell_renderer_text_new (); 
+int i;
+       GSList *columns = NULL;
        GtkWidget *header_tree;
+       ModestTnyHeaderTreeViewColumn cols[] = {
+               MODEST_TNY_HEADER_TREE_VIEW_COLUMN_FROM,
+               MODEST_TNY_HEADER_TREE_VIEW_COLUMN_TO,
+               MODEST_TNY_HEADER_TREE_VIEW_COLUMN_SUBJECT,
+               MODEST_TNY_HEADER_TREE_VIEW_COLUMN_SENT_DATE,
+               MODEST_TNY_HEADER_TREE_VIEW_COLUMN_RECEIVED_DATE,
+               MODEST_TNY_HEADER_TREE_VIEW_COLUMN_MSGTYPE,
+               MODEST_TNY_HEADER_TREE_VIEW_COLUMN_ATTACH
+       };
+       
+       for (i = 0 ; i != sizeof(cols)/sizeof(ModestTnyHeaderTreeViewColumn); ++i)
+               columns = g_slist_append (columns, GINT_TO_POINTER(cols[i]));
+       
+       header_tree = GTK_WIDGET(modest_tny_header_tree_view_new(folder, columns,
+                                        MODEST_TNY_HEADER_TREE_VIEW_STYLE_NORMAL));
+       g_slist_free (columns);
        
-       header_tree = GTK_WIDGET(modest_tny_header_tree_view_new(folder));
        if (!header_tree) {
                g_warning ("could not create header tree");
                return NULL;
        }
 
-       column =  gtk_tree_view_column_new_with_attributes(_("Date"), renderer,
-                                                          "text",
-                                                          TNY_MSG_HEADER_LIST_MODEL_DATE_RECEIVED_COLUMN,
-                                                          NULL);
-       gtk_tree_view_column_set_resizable (column, TRUE);
-       gtk_tree_view_append_column (GTK_TREE_VIEW(header_tree), column);
-
-
-
-       column =  gtk_tree_view_column_new_with_attributes(_("From"), renderer,
-                                                          "text",
-                                                          TNY_MSG_HEADER_LIST_MODEL_FROM_COLUMN,
-                                                          NULL);
-       gtk_tree_view_column_set_resizable (column, TRUE);
-       gtk_tree_view_append_column (GTK_TREE_VIEW(header_tree), column);
-
-
-       column =  gtk_tree_view_column_new_with_attributes(_("Subject"), renderer,
-                                                          "text",
-                                                          TNY_MSG_HEADER_LIST_MODEL_SUBJECT_COLUMN,
-                                                          NULL);
-       gtk_tree_view_column_set_resizable (column, TRUE);
-       gtk_tree_view_append_column (GTK_TREE_VIEW(header_tree), column);
-
-       gtk_tree_view_set_headers_visible   (GTK_TREE_VIEW(header_tree), TRUE);
-       gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(header_tree), TRUE);
-       
        return GTK_WIDGET(header_tree);
 }
 
@@ -542,4 +530,3 @@ static void on_message_clicked (ModestTnyFolderTreeView *folder_tree,
        modest_tny_msg_view_set_message (priv->message_view,
                                         message);
 }
-