Synchronise with 4.11

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

diff --git a/.version b/.version
index 8498a07983d13b021d1b39d7d85b67cad3bb072b..9846f0a3c2cf814fcc099bace686a2a6ba2e50d4 100644 (file)
--- a/.version
+++ b/.version
@@ -1,2 +1,2 @@
-4.10.0 c470abd4fde40ea6a0846a2beab642a578c0b8cd Fearless Coyote
+4.11.0 a351e9b9fc24e982ec2f0e76379a49826036da12 Fearless Coyote

 0
 0

diff --git a/frontends/gconf/gconf.c b/frontends/gconf/gconf.c
index a932034a1e6f3203025cfae3d9798304889ec678..dca17e18beafb90b00cfd3bf9ac800f29eaac6c5 100644 (file)
--- a/frontends/gconf/gconf.c
+++ b/frontends/gconf/gconf.c
@@ -914,7 +914,7 @@ on_treeview2_button_press_event(GtkWidget * widget,
                        current = menu;
                        display_tree_part();
                        gtk_widget_set_sensitive(back_btn, TRUE);
                        current = menu;
                        display_tree_part();
                        gtk_widget_set_sensitive(back_btn, TRUE);

-               } else if ((col == COL_OPTION)) {
+               } else if (col == COL_OPTION) {

                        toggle_sym_value(menu);
                        gtk_tree_view_expand_row(view, path, TRUE);
                }
                        toggle_sym_value(menu);
                        gtk_tree_view_expand_row(view, path, TRUE);
                }

diff --git a/scripts/ksync.log b/scripts/ksync.log
index c8510587406971760bae0bed14d2f6ab84fb4465..7acb27c941f15eba581b3aa9e905cfb6fe0dde5c 100644 (file)
--- a/scripts/ksync.log
+++ b/scripts/ksync.log
@@ -170,3 +170,4 @@ cfd7c612 kconfig-language: improve menuconfig usage description
 79e51b5 kconfig/nconf: Fix hang when editing symbol with a long prompt
 e039303 xconfig: fix 'Show Debug' functionality
 83c3a1b xconfig: fix missing suboption and help panels on first run
 79e51b5 kconfig/nconf: Fix hang when editing symbol with a long prompt
 e039303 xconfig: fix 'Show Debug' functionality
 83c3a1b xconfig: fix missing suboption and help panels on first run

+9be3213 gconfig: remove misleading parentheses around a condition