diff options
Diffstat (limited to 'scripts/kconfig/gconf.c')
| -rw-r--r-- | scripts/kconfig/gconf.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 9f4438027df4..adc230638c5b 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c | |||
| @@ -683,7 +683,7 @@ void on_introduction1_activate(GtkMenuItem * menuitem, gpointer user_data) | |||
| 683 | dialog = gtk_message_dialog_new(GTK_WINDOW(main_wnd), | 683 | dialog = gtk_message_dialog_new(GTK_WINDOW(main_wnd), |
| 684 | GTK_DIALOG_DESTROY_WITH_PARENT, | 684 | GTK_DIALOG_DESTROY_WITH_PARENT, |
| 685 | GTK_MESSAGE_INFO, | 685 | GTK_MESSAGE_INFO, |
| 686 | GTK_BUTTONS_CLOSE, intro_text); | 686 | GTK_BUTTONS_CLOSE, "%s", intro_text); |
| 687 | g_signal_connect_swapped(GTK_OBJECT(dialog), "response", | 687 | g_signal_connect_swapped(GTK_OBJECT(dialog), "response", |
| 688 | G_CALLBACK(gtk_widget_destroy), | 688 | G_CALLBACK(gtk_widget_destroy), |
| 689 | GTK_OBJECT(dialog)); | 689 | GTK_OBJECT(dialog)); |
| @@ -701,7 +701,7 @@ void on_about1_activate(GtkMenuItem * menuitem, gpointer user_data) | |||
| 701 | dialog = gtk_message_dialog_new(GTK_WINDOW(main_wnd), | 701 | dialog = gtk_message_dialog_new(GTK_WINDOW(main_wnd), |
| 702 | GTK_DIALOG_DESTROY_WITH_PARENT, | 702 | GTK_DIALOG_DESTROY_WITH_PARENT, |
| 703 | GTK_MESSAGE_INFO, | 703 | GTK_MESSAGE_INFO, |
| 704 | GTK_BUTTONS_CLOSE, about_text); | 704 | GTK_BUTTONS_CLOSE, "%s", about_text); |
| 705 | g_signal_connect_swapped(GTK_OBJECT(dialog), "response", | 705 | g_signal_connect_swapped(GTK_OBJECT(dialog), "response", |
| 706 | G_CALLBACK(gtk_widget_destroy), | 706 | G_CALLBACK(gtk_widget_destroy), |
| 707 | GTK_OBJECT(dialog)); | 707 | GTK_OBJECT(dialog)); |
| @@ -720,7 +720,7 @@ void on_license1_activate(GtkMenuItem * menuitem, gpointer user_data) | |||
| 720 | dialog = gtk_message_dialog_new(GTK_WINDOW(main_wnd), | 720 | dialog = gtk_message_dialog_new(GTK_WINDOW(main_wnd), |
| 721 | GTK_DIALOG_DESTROY_WITH_PARENT, | 721 | GTK_DIALOG_DESTROY_WITH_PARENT, |
| 722 | GTK_MESSAGE_INFO, | 722 | GTK_MESSAGE_INFO, |
| 723 | GTK_BUTTONS_CLOSE, license_text); | 723 | GTK_BUTTONS_CLOSE, "%s", license_text); |
| 724 | g_signal_connect_swapped(GTK_OBJECT(dialog), "response", | 724 | g_signal_connect_swapped(GTK_OBJECT(dialog), "response", |
| 725 | G_CALLBACK(gtk_widget_destroy), | 725 | G_CALLBACK(gtk_widget_destroy), |
| 726 | GTK_OBJECT(dialog)); | 726 | GTK_OBJECT(dialog)); |
| @@ -830,7 +830,7 @@ static void renderer_edited(GtkCellRendererText * cell, | |||
| 830 | static void change_sym_value(struct menu *menu, gint col) | 830 | static void change_sym_value(struct menu *menu, gint col) |
| 831 | { | 831 | { |
| 832 | struct symbol *sym = menu->sym; | 832 | struct symbol *sym = menu->sym; |
| 833 | tristate oldval, newval; | 833 | tristate newval; |
| 834 | 834 | ||
| 835 | if (!sym) | 835 | if (!sym) |
| 836 | return; | 836 | return; |
| @@ -847,7 +847,6 @@ static void change_sym_value(struct menu *menu, gint col) | |||
| 847 | switch (sym_get_type(sym)) { | 847 | switch (sym_get_type(sym)) { |
| 848 | case S_BOOLEAN: | 848 | case S_BOOLEAN: |
| 849 | case S_TRISTATE: | 849 | case S_TRISTATE: |
| 850 | oldval = sym_get_tristate_value(sym); | ||
| 851 | if (!sym_tristate_within_range(sym, newval)) | 850 | if (!sym_tristate_within_range(sym, newval)) |
| 852 | newval = yes; | 851 | newval = yes; |
| 853 | sym_set_tristate_value(sym, newval); | 852 | sym_set_tristate_value(sym, newval); |
| @@ -1278,7 +1277,6 @@ static void update_tree(struct menu *src, GtkTreeIter * dst) | |||
| 1278 | gboolean valid; | 1277 | gboolean valid; |
| 1279 | GtkTreeIter *sibling; | 1278 | GtkTreeIter *sibling; |
| 1280 | struct symbol *sym; | 1279 | struct symbol *sym; |
| 1281 | struct property *prop; | ||
| 1282 | struct menu *menu1, *menu2; | 1280 | struct menu *menu1, *menu2; |
| 1283 | 1281 | ||
| 1284 | if (src == &rootmenu) | 1282 | if (src == &rootmenu) |
| @@ -1287,7 +1285,6 @@ static void update_tree(struct menu *src, GtkTreeIter * dst) | |||
| 1287 | valid = gtk_tree_model_iter_children(model2, child2, dst); | 1285 | valid = gtk_tree_model_iter_children(model2, child2, dst); |
| 1288 | for (child1 = src->list; child1; child1 = child1->next) { | 1286 | for (child1 = src->list; child1; child1 = child1->next) { |
| 1289 | 1287 | ||
| 1290 | prop = child1->prompt; | ||
| 1291 | sym = child1->sym; | 1288 | sym = child1->sym; |
| 1292 | 1289 | ||
| 1293 | reparse: | 1290 | reparse: |
