Synchronise with v3.16

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

diff --git a/frontends/gconf/gconf.c b/frontends/gconf/gconf.c
index a40292cc0619b0b7b279f448870a756e85816442..b94dfa34a5b32cc6c034f39cc8329f10f8e92909 100644 (file)
--- a/frontends/gconf/gconf.c
+++ b/frontends/gconf/gconf.c
@@ -10,6 +10,7 @@
 #  include <config.h>
 #endif
 
+#include <stdlib.h>
 #include "lkc.h"
 #include "images.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,7 +1468,9 @@ void fixup_rootmenu(struct menu *menu)
 int main(int ac, char *av[])
 {
        const char *name;
+#if 0
        char *env;
+#endif
        gchar *glade_file = GUI_PATH;
 
        bindtextdomain(PACKAGE, LOCALEDIR);