gconf.c.patch 960 B

12345678910111213141516171819202122232425262728293031323334353637383940
  1. diff --git a/frontends/gconf/gconf.c b/frontends/gconf/gconf.c
  2. --- a/frontends/gconf/gconf.c
  3. +++ b/frontends/gconf/gconf.c
  4. @@ -12,7 +12,7 @@
  5. #include <stdlib.h>
  6. #include "lkc.h"
  7. -#include "images.c"
  8. +#include "images.h"
  9. #include <glade/glade.h>
  10. #include <gtk/gtk.h>
  11. @@ -1444,8 +1444,10 @@
  12. int main(int ac, char *av[])
  13. {
  14. const char *name;
  15. +#if 0
  16. char *env;
  17. +#endif
  18. - gchar *glade_file;
  19. + gchar *glade_file = GUI_PATH;
  20. bindtextdomain(PACKAGE, LOCALEDIR);
  21. bind_textdomain_codeset(PACKAGE, "UTF-8");
  22. @@ -1459,6 +1461,7 @@
  23. //add_pixmap_directory (PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps");
  24. //add_pixmap_directory (PACKAGE_SOURCE_DIR "/pixmaps");
  25. +#if 0
  26. /* Determine GUI path */
  27. env = getenv(SRCTREE);
  28. if (env)
  29. @@ -1467,6 +1470,7 @@
  30. glade_file = g_strconcat(av[0], ".glade", NULL);
  31. else
  32. glade_file = g_strconcat(g_get_current_dir(), "/", av[0], ".glade", NULL);
  33. +#endif
  34. /* Conf stuffs */
  35. if (ac > 1 && av[1][0] == '-') {