aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/kconfig/gconf.c
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2011-06-08 11:40:20 -0400
committerMichal Marek <mmarek@suse.cz>2011-06-08 12:03:57 -0400
commit36fee53510f91d8ac5eb5dcba0e431a21ebdd5cd (patch)
tree02cf4abcfc033d75f11b00055280e14eeb86e7e0 /scripts/kconfig/gconf.c
parenta61944c251c3e68c4bbf6eb96ff61c7b286351c5 (diff)
parent1ea3ad4e93222faf1d138ceb10291376d2da7cc6 (diff)
Merge branch 'kconfig-trivial' of git://github.com/lacombar/linux-2.6 into kbuild/kconfig
Diffstat (limited to 'scripts/kconfig/gconf.c')
-rw-r--r--scripts/kconfig/gconf.c38
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)
285static void renderer_edited(GtkCellRendererText * cell, 285static void renderer_edited(GtkCellRendererText * cell,
286 const gchar * path_string, 286 const gchar * path_string,
287 const gchar * new_text, gpointer user_data); 287 const gchar * new_text, gpointer user_data);
288static void renderer_toggled(GtkCellRendererToggle * cellrenderertoggle,
289 gchar * arg1, gpointer user_data);
290 288
291void init_right_tree(void) 289void init_right_tree(void)
292{ 290{
@@ -320,8 +318,6 @@ void init_right_tree(void)
320 "inconsistent", COL_BTNINC, 318 "inconsistent", COL_BTNINC,
321 "visible", COL_BTNVIS, 319 "visible", COL_BTNVIS,
322 "radio", COL_BTNRAD, NULL); 320 "radio", COL_BTNRAD, NULL);
323 /*g_signal_connect(G_OBJECT(renderer), "toggled",
324 G_CALLBACK(renderer_toggled), NULL); */
325 renderer = gtk_cell_renderer_text_new(); 321 renderer = gtk_cell_renderer_text_new();
326 gtk_tree_view_column_pack_start(GTK_TREE_VIEW_COLUMN(column), 322 gtk_tree_view_column_pack_start(GTK_TREE_VIEW_COLUMN(column),
327 renderer, FALSE); 323 renderer, FALSE);
@@ -888,35 +884,6 @@ static void toggle_sym_value(struct menu *menu)
888 display_tree_part(); //fixme: keep exp/coll 884 display_tree_part(); //fixme: keep exp/coll
889} 885}
890 886
891static void renderer_toggled(GtkCellRendererToggle * cell,
892 gchar * path_string, gpointer user_data)
893{
894 GtkTreePath *path, *sel_path = NULL;
895 GtkTreeIter iter, sel_iter;
896 GtkTreeSelection *sel;
897 struct menu *menu;
898
899 path = gtk_tree_path_new_from_string(path_string);
900 if (!gtk_tree_model_get_iter(model2, &iter, path))
901 return;
902
903 sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree2_w));
904 if (gtk_tree_selection_get_selected(sel, NULL, &sel_iter))
905 sel_path = gtk_tree_model_get_path(model2, &sel_iter);
906 if (!sel_path)
907 goto out1;
908 if (gtk_tree_path_compare(path, sel_path))
909 goto out2;
910
911 gtk_tree_model_get(model2, &iter, COL_MENU, &menu, -1);
912 toggle_sym_value(menu);
913
914 out2:
915 gtk_tree_path_free(sel_path);
916 out1:
917 gtk_tree_path_free(path);
918}
919
920static gint column2index(GtkTreeViewColumn * column) 887static gint column2index(GtkTreeViewColumn * column)
921{ 888{
922 gint i; 889 gint i;
@@ -1172,6 +1139,7 @@ static gchar **fill_row(struct menu *menu)
1172 row[COL_BTNVIS] = GINT_TO_POINTER(TRUE); 1139 row[COL_BTNVIS] = GINT_TO_POINTER(TRUE);
1173 if (sym_is_choice(sym)) 1140 if (sym_is_choice(sym))
1174 break; 1141 break;
1142 /* fall through */
1175 case S_TRISTATE: 1143 case S_TRISTATE:
1176 val = sym_get_tristate_value(sym); 1144 val = sym_get_tristate_value(sym);
1177 switch (val) { 1145 switch (val) {
@@ -1506,10 +1474,6 @@ int main(int ac, char *av[])
1506 char *env; 1474 char *env;
1507 gchar *glade_file; 1475 gchar *glade_file;
1508 1476
1509#ifndef LKC_DIRECT_LINK
1510 kconfig_load();
1511#endif
1512
1513 bindtextdomain(PACKAGE, LOCALEDIR); 1477 bindtextdomain(PACKAGE, LOCALEDIR);
1514 bind_textdomain_codeset(PACKAGE, "UTF-8"); 1478 bind_textdomain_codeset(PACKAGE, "UTF-8");
1515 textdomain(PACKAGE); 1479 textdomain(PACKAGE);