1 files changed, 11 insertions, 3 deletions

diff --git a/src/common/helper.c b/src/common/helper.c
index 6b89131b..a176eecc 100644
--- a/src/common/helper.c
+++ b/src/common/helper.c
@@ -375,6 +375,8 @@ void initGNUnetGTKCommon(struct GE_Context * e,
                          struct GC_Configuration * c,
                          void * callback) {
   char * load;
+  char * path;
+  char * filename;
 
   ectx = e;
   cfg = c;
@@ -384,13 +386,19 @@ void initGNUnetGTKCommon(struct GE_Context * e,
   saveCallsUp = YES;
 
   /* load the interface */
-#ifdef MINGW
+  path = os_get_installation_path(IPK_DATADIR);
+  filename = MALLOC(strlen(path) + strlen("/../gnunet-gtk/gnunet-gtk.glade") + 2);
+  strcpy(filename, path);
+  FREE(path);
+  strcat(filename, "/../gnunet-gtk/gnunet-gtk.glade");
+#if MINGW
   gladeFile = MALLOC(_MAX_PATH + 1);
-  plibc_conv_to_win_path(PACKAGE_DATA_DIR"/gnunet-gtk.glade",
+  plibc_conv_to_win_path(filename,
                          gladeFile);
 #else
-  gladeFile = STRDUP(PACKAGE_DATA_DIR"/gnunet-gtk.glade");
+  gladeFile = STRDUP(filename);
 #endif
+  FREE(filename);
   
   mainXML = glade_xml_new(gladeFile,
                           "mainWindow",