Merge branch 'kconfig-trivial' of git://github.com/lacombar/linux-2.6 into kbuild/kconfig

1 files changed, 1 insertions, 37 deletions

diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
index a11d5f7b9eeb..9f4438027df4 100644
--- a/scripts/kconfig/gconf.c
+++ b/scripts/kconfig/gconf.c
@@ -285,8 +285,6 @@ void init_left_tree(void)
 static void renderer_edited(GtkCellRendererText * cell,
                             const gchar * path_string,
                             const gchar * new_text, gpointer user_data);
-static void renderer_toggled(GtkCellRendererToggle * cellrenderertoggle,
-                             gchar * arg1, gpointer user_data);
 
 void init_right_tree(void)
 {
@@ -320,8 +318,6 @@ void init_right_tree(void)
                                             "inconsistent", COL_BTNINC,
                                             "visible", COL_BTNVIS,
                                             "radio", COL_BTNRAD, NULL);
-        /*g_signal_connect(G_OBJECT(renderer), "toggled",
-           G_CALLBACK(renderer_toggled), NULL); */
         renderer = gtk_cell_renderer_text_new();
         gtk_tree_view_column_pack_start(GTK_TREE_VIEW_COLUMN(column),
                                         renderer, FALSE);
@@ -888,35 +884,6 @@ static void toggle_sym_value(struct menu *menu)
                 display_tree_part();    //fixme: keep exp/coll
 }
 
-static void renderer_toggled(GtkCellRendererToggle * cell,
-                             gchar * path_string, gpointer user_data)
-{
-        GtkTreePath *path, *sel_path = NULL;
-        GtkTreeIter iter, sel_iter;
-        GtkTreeSelection *sel;
-        struct menu *menu;
-
-        path = gtk_tree_path_new_from_string(path_string);
-        if (!gtk_tree_model_get_iter(model2, &iter, path))
-                return;
-
-        sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree2_w));
-        if (gtk_tree_selection_get_selected(sel, NULL, &sel_iter))
-                sel_path = gtk_tree_model_get_path(model2, &sel_iter);
-        if (!sel_path)
-                goto out1;
-        if (gtk_tree_path_compare(path, sel_path))
-                goto out2;
-
-        gtk_tree_model_get(model2, &iter, COL_MENU, &menu, -1);
-        toggle_sym_value(menu);
-
-      out2:
-        gtk_tree_path_free(sel_path);
-      out1:
-        gtk_tree_path_free(path);
-}
-
 static gint column2index(GtkTreeViewColumn * column)
 {
         gint i;
@@ -1172,6 +1139,7 @@ static gchar **fill_row(struct menu *menu)
                         row[COL_BTNVIS] = GINT_TO_POINTER(TRUE);
                 if (sym_is_choice(sym))
                         break;
+                /* fall through */
         case S_TRISTATE:
                 val = sym_get_tristate_value(sym);
                 switch (val) {
@@ -1506,10 +1474,6 @@ int main(int ac, char *av[])
         char *env;
         gchar *glade_file;
 
-#ifndef LKC_DIRECT_LINK
-        kconfig_load();
-#endif
-
         bindtextdomain(PACKAGE, LOCALEDIR);
         bind_textdomain_codeset(PACKAGE, "UTF-8");
         textdomain(PACKAGE);