diff -urN sylpheed-2.2.4/libsylph/prefs_common.c sylpheed-2.2.4-ph/libsylph/prefs_common.c --- sylpheed-2.2.4/libsylph/prefs_common.c 2006-03-16 23:34:41.000000000 -0500 +++ sylpheed-2.2.4-ph/libsylph/prefs_common.c 2006-04-07 14:46:54.000000000 -0400 @@ -126,6 +126,8 @@ {"toolbar_style", "3", &prefs_common.toolbar_style, P_ENUM}, {"show_searchbar", "TRUE", &prefs_common.show_searchbar, P_BOOL}, + {"show_gtk_headers", "TRUE", + &prefs_common.show_gtk_headers, P_BOOL}, {"show_statusbar", "TRUE", &prefs_common.show_statusbar, P_BOOL}, {"summary_col_show_mark", "TRUE", diff -urN sylpheed-2.2.4/libsylph/prefs_common.h sylpheed-2.2.4-ph/libsylph/prefs_common.h --- sylpheed-2.2.4/libsylph/prefs_common.h 2006-03-16 23:33:37.000000000 -0500 +++ sylpheed-2.2.4-ph/libsylph/prefs_common.h 2006-04-07 14:47:10.000000000 -0400 @@ -113,6 +113,7 @@ gboolean bold_unread; ToolbarStyle toolbar_style; + gboolean show_gtk_headers; gboolean show_searchbar; gboolean show_statusbar; diff -urN sylpheed-2.2.4/src/folderview.c sylpheed-2.2.4-ph/src/folderview.c --- sylpheed-2.2.4/src/folderview.c 2006-03-26 23:30:25.000000000 -0500 +++ sylpheed-2.2.4-ph/src/folderview.c 2006-04-07 15:14:13.000000000 -0400 @@ -341,7 +341,7 @@ treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)); g_object_unref(G_OBJECT(store)); - gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), TRUE); + gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), prefs_common.show_gtk_headers); gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(treeview), FALSE); gtk_tree_view_set_search_column(GTK_TREE_VIEW(treeview), COL_FOLDER_NAME); diff -urN sylpheed-2.2.4/src/mainwindow.c sylpheed-2.2.4-ph/src/mainwindow.c --- sylpheed-2.2.4/src/mainwindow.c 2006-03-09 21:48:52.000000000 -0500 +++ sylpheed-2.2.4-ph/src/mainwindow.c 2006-04-07 14:53:26.000000000 -0400 @@ -258,6 +258,9 @@ static void toggle_toolbar_cb (MainWindow *mainwin, guint action, GtkWidget *widget); +static void toggle_gtk_headers_cb (MainWindow *mainwin, + guint action, + GtkWidget *widget); static void toggle_searchbar_cb (MainWindow *mainwin, guint action, GtkWidget *widget); @@ -543,6 +546,8 @@ NULL, toggle_toolbar_cb, TOOLBAR_TEXT, "/View/Show or hide/Toolbar/Icon and text"}, {N_("/_View/Show or hi_de/_Toolbar/_None"), NULL, toggle_toolbar_cb, TOOLBAR_NONE, "/View/Show or hide/Toolbar/Icon and text"}, + {N_("/_View/Show or hi_de/GTK headers"), + NULL, toggle_gtk_headers_cb, 0, ""}, {N_("/_View/Show or hi_de/_Search bar"), NULL, toggle_searchbar_cb, 0, ""}, {N_("/_View/Show or hi_de/Status _bar"), @@ -1075,6 +1080,11 @@ } gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE); + menuitem = gtk_item_factory_get_item + (ifactory, "/View/Show or hide/GTK headers"); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), + prefs_common.show_gtk_headers); + gtk_widget_hide(summaryview->search_hbox); menuitem = gtk_item_factory_get_item (ifactory, "/View/Show or hide/Search bar"); @@ -3015,6 +3025,24 @@ prefs_common.toolbar_style = (ToolbarStyle)action; } +static void toggle_gtk_headers_cb(MainWindow *mainwin, guint action, + GtkWidget *widget) +{ + if (GTK_CHECK_MENU_ITEM(widget)->active) { + gtk_tree_view_set_headers_visible(GTK_TREE_VIEW( + mainwin->folderview->treeview), TRUE); + gtk_tree_view_set_headers_visible(GTK_TREE_VIEW( + mainwin->summaryview->treeview), TRUE); + prefs_common.show_gtk_headers = TRUE; + } else { + gtk_tree_view_set_headers_visible(GTK_TREE_VIEW( + mainwin->folderview->treeview), FALSE); + gtk_tree_view_set_headers_visible(GTK_TREE_VIEW( + mainwin->summaryview->treeview), FALSE); + prefs_common.show_gtk_headers = FALSE; + } +} + static void toggle_searchbar_cb(MainWindow *mainwin, guint action, GtkWidget *widget) { diff -urN sylpheed-2.2.4/src/summaryview.c sylpheed-2.2.4-ph/src/summaryview.c --- sylpheed-2.2.4/src/summaryview.c 2006-03-26 23:29:39.000000000 -0500 +++ sylpheed-2.2.4-ph/src/summaryview.c 2006-04-07 15:22:06.000000000 -0400 @@ -4868,7 +4868,7 @@ #undef SET_SORT treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)); - gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), TRUE); + gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), prefs_common.show_gtk_headers); gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(treeview), prefs_common.enable_rules_hint); gtk_tree_view_set_enable_search(GTK_TREE_VIEW(treeview), FALSE);