* (gtk|maemo)/modest-main-window.c:

	- no need to set the column headers anymore, after the modest-init stuff

pmo-trunk-r650

diff --git a/src/gtk/modest-main-window.c b/src/gtk/modest-main-window.c
index 3e1fe2e..a6268a9 100644 (file)
--- a/src/gtk/modest-main-window.c
+++ b/src/gtk/modest-main-window.c
@@ -182,26 +182,13 @@ static ModestHeaderView*
 header_view_new (ModestMainWindow *self)
 {
        int i;
-       GList *columns = NULL;
        ModestHeaderView *header_view;
        ModestMainWindowPrivate *priv;
-       ModestHeaderViewColumn cols[] = {
-               MODEST_HEADER_VIEW_COLUMN_MSGTYPE,
-               MODEST_HEADER_VIEW_COLUMN_ATTACH,
-               MODEST_HEADER_VIEW_COLUMN_FROM,
-               MODEST_HEADER_VIEW_COLUMN_SUBJECT,
-               MODEST_HEADER_VIEW_COLUMN_RECEIVED_DATE
-       };
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
        
-       for (i = 0 ; i != sizeof(cols) / sizeof(ModestHeaderViewColumn); ++i)
-               columns = g_list_append (columns, GINT_TO_POINTER(cols[i]));
-
        header_view = modest_widget_factory_get_header_view (priv->widget_factory);
-       modest_header_view_set_columns (header_view, columns);
        modest_header_view_set_style (header_view,
                                      MODEST_HEADER_VIEW_STYLE_SHOW_HEADERS);
-       g_list_free (columns);
        return header_view;
 }
 

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index 2eb54d0..1d795c7 100644 (file)
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -168,25 +168,13 @@ static ModestHeaderView*
 header_view_new (ModestMainWindow *self)
 {
        int i;
-       GList *columns = NULL;
        ModestHeaderView *header_view;
        ModestMainWindowPrivate *priv;
-       ModestHeaderViewColumn cols[] = {
-               MODEST_HEADER_VIEW_COLUMN_MSGTYPE,
-               MODEST_HEADER_VIEW_COLUMN_ATTACH,
-               MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN,
-       };
-       priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
        
-       for (i = 0 ; i != sizeof(cols) / sizeof(ModestHeaderViewColumn); ++i)
-               columns = g_list_append (columns, GINT_TO_POINTER(cols[i]));
-
+       priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
        header_view = modest_widget_factory_get_header_view (priv->widget_factory);
-       modest_header_view_set_columns (header_view, columns);
        modest_header_view_set_style (header_view, 0); /* don't show headers */
-
        
-       g_list_free (columns);
        return header_view;
 }