4 files changed, 15 insertions, 4 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",
diff --git a/src/core/main.c b/src/core/main.c
index 60f807aa..69cb1117 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -98,7 +98,6 @@ int main(int argc,
     GNUNET_fini(ectx, cfg);
     return -1;  
   }
-
 #ifdef WINDOWS
   if (!debug_mode)
     FreeConsole();
diff --git a/src/plugins/daemon/Makefile.am b/src/plugins/daemon/Makefile.am
index 822e06ab..2c06164d 100644
--- a/src/plugins/daemon/Makefile.am
+++ b/src/plugins/daemon/Makefile.am
@@ -15,6 +15,7 @@ libgnunetgtkmodule_daemon_la_LIBADD = \
          @GTK_LIBS@ @GNUNETGTK_LIBS@ \
   $(top_builddir)/src/common/libgnunetgtk_common.la \
   -lgnunetutil \
+  -lgnunetutil_cron \
   -lgnunetgetoption_api
 libgnunetgtkmodule_daemon_la_LDFLAGS = \
   -export-dynamic -avoid-version -module
diff --git a/src/plugins/fs/Makefile.am b/src/plugins/fs/Makefile.am
index 894a1529..ee8a6b49 100644
--- a/src/plugins/fs/Makefile.am
+++ b/src/plugins/fs/Makefile.am
@@ -26,7 +26,10 @@ libgnunetgtkmodule_fs_la_LIBADD = \
   -lgthread-2.0 \
   -lextractor \
   -lgnunetutil \
+  -lgnunetcollection \
   -lgnunetfsui \
+  -lgnunetnamespace \
+  -lgnuneturitrack \
   -lgnunetecrs
 libgnunetgtkmodule_fs_la_LDFLAGS = \
   -export-dynamic -avoid-version -module