[GNUnet-SVN] r31651 - in gnunet-gtk: contrib src/fs src/lib src/namestore

[gnunet]

Author: grothoff
Date: 2013-12-21 18:56:34 +0100 (Sat, 21 Dec 2013)
New Revision: 31651

Modified:
   gnunet-gtk/contrib/gnunet_identity_gtk_about_window.glade
   gnunet-gtk/src/fs/Makefile.am
   gnunet-gtk/src/lib/eventloop.c
   gnunet-gtk/src/namestore/Makefile.am
   gnunet-gtk/src/namestore/gnunet-namestore-gtk.conf
Log:
-fix code to locate config files

Modified: gnunet-gtk/contrib/gnunet_identity_gtk_about_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_identity_gtk_about_window.glade   2013-12-21 
17:26:23 UTC (rev 31650)
+++ gnunet-gtk/contrib/gnunet_identity_gtk_about_window.glade   2013-12-21 
17:56:34 UTC (rev 31651)
@@ -91,7 +91,7 @@
           <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"/>

Modified: gnunet-gtk/src/fs/Makefile.am
===================================================================
--- gnunet-gtk/src/fs/Makefile.am       2013-12-21 17:26:23 UTC (rev 31650)
+++ gnunet-gtk/src/fs/Makefile.am       2013-12-21 17:56:34 UTC (rev 31651)
@@ -44,7 +44,7 @@
 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

Modified: gnunet-gtk/src/lib/eventloop.c
===================================================================
--- gnunet-gtk/src/lib/eventloop.c      2013-12-21 17:26:23 UTC (rev 31650)
+++ gnunet-gtk/src/lib/eventloop.c      2013-12-21 17:56:34 UTC (rev 31651)
@@ -924,7 +924,7 @@
   }
   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);

Modified: gnunet-gtk/src/namestore/Makefile.am
===================================================================
--- gnunet-gtk/src/namestore/Makefile.am        2013-12-21 17:26:23 UTC (rev 
31650)
+++ gnunet-gtk/src/namestore/Makefile.am        2013-12-21 17:56:34 UTC (rev 
31651)
@@ -3,7 +3,7 @@
 # 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)/ \

Modified: gnunet-gtk/src/namestore/gnunet-namestore-gtk.conf
===================================================================
--- gnunet-gtk/src/namestore/gnunet-namestore-gtk.conf  2013-12-21 17:26:23 UTC 
(rev 31650)
+++ gnunet-gtk/src/namestore/gnunet-namestore-gtk.conf  2013-12-21 17:56:34 UTC 
(rev 31651)
@@ -1,2 +1,3 @@
 [namestore-gtk]
-NICK_EXPIRATION = 1 week
\ No newline at end of file
+NICK_EXPIRATION = 1 week
+