Yann E. MORIN" f8e2db383a Synchronise with v3.9-rc1
This brings up all changes accumulated since v3.7 was released:
  - get the "CONFIG_" prefix from the environment
  - enhancements in mconf: navigable input boxes, better UI, fix in lxdialog
  - enhancements in nconf: entirely rewritten help texts, UI tweaks
  - fixes in qconf and conf
  - fix in documentation

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
2013-03-04 23:32:54 +01:00

41 lines
960 B
Diff

diff --git a/frontends/gconf/gconf.c b/frontends/gconf/gconf.c
--- a/frontends/gconf/gconf.c
+++ b/frontends/gconf/gconf.c
@@ -12,7 +12,7 @@
#include <stdlib.h>
#include "lkc.h"
-#include "images.c"
+#include "images.h"
#include <glade/glade.h>
#include <gtk/gtk.h>
@@ -1468,8 +1468,10 @@
int main(int ac, char *av[])
{
const char *name;
+#if 0
char *env;
+#endif
- gchar *glade_file;
+ gchar *glade_file = GUI_PATH;
bindtextdomain(PACKAGE, LOCALEDIR);
bind_textdomain_codeset(PACKAGE, "UTF-8");
@@ -1483,6 +1485,7 @@
//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 @@
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] == '-') {