Synchronise with 4.11

[kconfig-frontends] / frontends / gconf / gconf.c

diff --git a/frontends/gconf/gconf.c b/frontends/gconf/gconf.c
index adc230638c5b141ceaa2cf9b25d35f99324c19b6..dca17e18beafb90b00cfd3bf9ac800f29eaac6c5 100644 (file)
--- a/frontends/gconf/gconf.c
+++ b/frontends/gconf/gconf.c
@@ -10,8 +10,9 @@
 #  include <config.h>
 #endif
 
+#include <stdlib.h>
 #include "lkc.h"
-#include "images.c"
+#include "images.h"
 
 #include <glade/glade.h>
 #include <gtk/gtk.h>
@@ -22,7 +23,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <time.h>
-#include <stdlib.h>
 
 //#define DEBUG
 
@@ -169,14 +169,6 @@ void init_main_window(const gchar * glade_file)
        style = gtk_widget_get_style(main_wnd);
        widget = glade_xml_get_widget(xml, "toolbar1");
 
-#if 0  /* Use stock Gtk icons instead */
-       replace_button_icon(xml, main_wnd->window, style,
-                           "button1", (gchar **) xpm_back);
-       replace_button_icon(xml, main_wnd->window, style,
-                           "button2", (gchar **) xpm_load);
-       replace_button_icon(xml, main_wnd->window, style,
-                           "button3", (gchar **) xpm_save);
-#endif
        replace_button_icon(xml, main_wnd->window, style,
                            "button4", (gchar **) xpm_single_view);
        replace_button_icon(xml, main_wnd->window, style,
@@ -184,22 +176,6 @@ void init_main_window(const gchar * glade_file)
        replace_button_icon(xml, main_wnd->window, style,
                            "button6", (gchar **) xpm_tree_view);
 
-#if 0
-       switch (view_mode) {
-       case SINGLE_VIEW:
-               widget = glade_xml_get_widget(xml, "button4");
-               g_signal_emit_by_name(widget, "clicked");
-               break;
-       case SPLIT_VIEW:
-               widget = glade_xml_get_widget(xml, "button5");
-               g_signal_emit_by_name(widget, "clicked");
-               break;
-       case FULL_VIEW:
-               widget = glade_xml_get_widget(xml, "button6");
-               g_signal_emit_by_name(widget, "clicked");
-               break;
-       }
-#endif
        txtbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_w));
        tag1 = gtk_text_buffer_create_tag(txtbuf, "mytag1",
                                          "foreground", "red",
@@ -938,7 +914,7 @@ on_treeview2_button_press_event(GtkWidget * widget,
                        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);
                }
@@ -1404,7 +1380,7 @@ static void display_tree(struct menu *menu)
                    && (tree == tree2))
                        continue;
 /*
-                if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT))
+               if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT))
                    || (view_mode == FULL_VIEW)
                    || (view_mode == SPLIT_VIEW))*/
 
@@ -1468,8 +1444,10 @@ void fixup_rootmenu(struct menu *menu)
 int main(int ac, char *av[])
 {
        const char *name;
+#if 0
        char *env;
-       gchar *glade_file;
+#endif
+       gchar *glade_file = GUI_PATH;
 
        bindtextdomain(PACKAGE, LOCALEDIR);
        bind_textdomain_codeset(PACKAGE, "UTF-8");
@@ -1483,6 +1461,7 @@ int main(int ac, char *av[])
        //add_pixmap_directory (PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps");
        //add_pixmap_directory (PACKAGE_SOURCE_DIR "/pixmaps");
 
+#if 0
        /* Determine GUI path */
        env = getenv(SRCTREE);
        if (env)
@@ -1491,6 +1470,7 @@ int main(int ac, char *av[])
                glade_file = g_strconcat(av[0], ".glade", NULL);
        else
                glade_file = g_strconcat(g_get_current_dir(), "/", av[0], ".glade", NULL);
+#endif
 
        /* Conf stuffs */
        if (ac > 1 && av[1][0] == '-') {
@@ -1498,9 +1478,12 @@ int main(int ac, char *av[])
                case 'a':
                        //showAll = 1;
                        break;
+               case 's':
+                       conf_set_message_callback(NULL);
+                       break;
                case 'h':
                case '?':
-                       printf("%s <config>\n", av[0]);
+                       printf("%s [-s] <config>\n", av[0]);
                        exit(0);
                }
                name = av[2];