Merge branch 'kconfig-for-40' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

* 'kconfig-for-40' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  xconfig: merge code path to conf_write()
  kconfig: do not record timestamp in .config
  gconfig: Hide unused left treeview when start up the interface
  gconfig: enable rules hint for main treeviews
  MAINTAINERS: Update KCONFIG entry
  kconfig-language: add to hints
  kconfig: Document the new "visible if" syntax
  kconfig: quiet commands when V=0
  kconfig: change update-po-config to reflect new layout of arch/um
  kconfig: make update-po-config work in KBUILD_OUTPUT
  kconfig: rearrange clean-files
  kconfig: change gconf to modify hostprogs-y like nconf and mconf
  kconfig: change qconf to modify hostprogs-y like nconf and mconf
  kconfig: only build kxgettext when needed
  nconfig: Silence unused return values from wattrset
  kconfig: Do not record timestamp in auto.conf and autoconf.h
  kconfig: get rid of unused flags
  kconfig: allow multiple inclusion of the same file
  kconfig: Avoid buffer underrun in choice input

1 files changed, 8 insertions, 4 deletions

diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
index 455896164d72..a11d5f7b9eeb 100644
--- a/scripts/kconfig/gconf.c
+++ b/scripts/kconfig/gconf.c
@@ -253,7 +253,7 @@ void init_left_tree(void)
 
         gtk_tree_view_set_model(view, model1);
         gtk_tree_view_set_headers_visible(view, TRUE);
-        gtk_tree_view_set_rules_hint(view, FALSE);
+        gtk_tree_view_set_rules_hint(view, TRUE);
 
         column = gtk_tree_view_column_new();
         gtk_tree_view_append_column(view, column);
@@ -298,7 +298,7 @@ void init_right_tree(void)
 
         gtk_tree_view_set_model(view, model2);
         gtk_tree_view_set_headers_visible(view, TRUE);
-        gtk_tree_view_set_rules_hint(view, FALSE);
+        gtk_tree_view_set_rules_hint(view, TRUE);
 
         column = gtk_tree_view_column_new();
         gtk_tree_view_append_column(view, column);
@@ -756,7 +756,6 @@ void on_load_clicked(GtkButton * button, gpointer user_data)
 void on_single_clicked(GtkButton * button, gpointer user_data)
 {
         view_mode = SINGLE_VIEW;
-        gtk_paned_set_position(GTK_PANED(hpaned), 0);
         gtk_widget_hide(tree1_w);
         current = &rootmenu;
         display_tree_part();
@@ -782,7 +781,6 @@ void on_split_clicked(GtkButton * button, gpointer user_data)
 void on_full_clicked(GtkButton * button, gpointer user_data)
 {
         view_mode = FULL_VIEW;
-        gtk_paned_set_position(GTK_PANED(hpaned), 0);
         gtk_widget_hide(tree1_w);
         if (tree2)
                 gtk_tree_store_clear(tree2);
@@ -1444,6 +1442,12 @@ static void display_tree(struct menu *menu)
                 if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT))
                     || (view_mode == FULL_VIEW)
                     || (view_mode == SPLIT_VIEW))*/
+
+                /* Change paned position if the view is not in 'split mode' */
+                if (view_mode == SINGLE_VIEW || view_mode == FULL_VIEW) {
+                        gtk_paned_set_position(GTK_PANED(hpaned), 0);
+                }
+
                 if (((view_mode == SINGLE_VIEW) && (menu->flags & MENU_ROOT))
                     || (view_mode == FULL_VIEW)
                     || (view_mode == SPLIT_VIEW)) {