-fix code to locate config files

5 files changed, 6 insertions, 5 deletions

diff --git a/contrib/gnunet_identity_gtk_about_window.glade b/contrib/gnunet_identity_gtk_about_window.glade
index a75a926a..097e8709 100644
--- a/contrib/gnunet_identity_gtk_about_window.glade
+++ b/contrib/gnunet_identity_gtk_about_window.glade
@@ -91,7 +91,7 @@ Daniel Nylander &lt;po@danielnylander.se&gt;</property>
           <object class="GtkLabel" id="about_name_version_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label">GNUnet-Peerinfo-GTK 0.9.5</property>
+            <property name="label">GNUnet-Peerinfo-GTK 0.9.3</property>
             <attributes>
               <attribute name="weight" value="bold"/>
               <attribute name="size" value="200"/>
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 9e305883..906b2936 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -44,7 +44,7 @@ gnunet_fs_gtk_LDADD = \
 gnunet_fs_gtk_LDFLAGS = \
   -export-dynamic
 
-pkgcfgdir= $(prefix)/share/gnunet/config.d/
+pkgcfgdir= $(prefix)/share/gnunet-gtk/config.d/
 
 pkgcfg_DATA = \
   gnunet-fs-gtk.conf
diff --git a/src/lib/eventloop.c b/src/lib/eventloop.c
index aabcfa63..d3aef7e7 100644
--- a/src/lib/eventloop.c
+++ b/src/lib/eventloop.c
@@ -924,7 +924,7 @@ run_main_loop (void *cls, char *const *args, const char *cfgfile,
   }
   if (0 != strcmp (ipath, ipath2))
   {
-    GNUNET_asprintf (&baseconfig, "%s%s", ipath, "config.d");
+    GNUNET_asprintf (&baseconfig, "%s%s", ipath2, "config.d");
     if (GNUNET_YES ==
         GNUNET_DISK_directory_test (baseconfig, GNUNET_YES))
       (void) GNUNET_CONFIGURATION_load_from (gcfg, baseconfig);
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index 46faba72..a396fed7 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = .
 # we use libgnunetutil to load plugins, and it
 # only looks in /gnunet, not /gnunet-gtk!
 plugindir = $(libdir)/gnunet
-pkgcfgdir= $(prefix)/share/gnunet/config.d/
+pkgcfgdir= $(prefix)/share/gnunet-gtk/config.d/
 
 AM_CPPFLAGS = \
   -I$(top_srcdir)/ \
diff --git a/src/namestore/gnunet-namestore-gtk.conf b/src/namestore/gnunet-namestore-gtk.conf
index 00d3f8e9..c27e9950 100644
--- a/src/namestore/gnunet-namestore-gtk.conf
+++ b/src/namestore/gnunet-namestore-gtk.conf
@@ -1,2 +1,3 @@
 [namestore-gtk]
-NICK_EXPIRATION = 1 week
\ No newline at end of file
+NICK_EXPIRATION = 1 week
+