Synchronise with v3.16

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

diff --git a/frontends/gconf/gconf.c b/frontends/gconf/gconf.c
index adc230638c5b141ceaa2cf9b25d35f99324c19b6..b94dfa34a5b32cc6c034f39cc8329f10f8e92909 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
 
@@ -1404,7 +1404,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 +1468,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 +1485,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 +1494,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] == '-') {