[GNUnet-SVN] r12885 - in gnunet-gtk: contrib src

[gnunet]

Author: grothoff
Date: 2010-09-07 14:34:42 +0200 (Tue, 07 Sep 2010)
New Revision: 12885

Modified:
   gnunet-gtk/contrib/Makefile.in
   gnunet-gtk/src/gnunet-gtk.c
   gnunet-gtk/src/os_installation.c
Log:
fix icon path

Modified: gnunet-gtk/contrib/Makefile.in
===================================================================
--- gnunet-gtk/contrib/Makefile.in      2010-09-07 12:33:57 UTC (rev 12884)
+++ gnunet-gtk/contrib/Makefile.in      2010-09-07 12:34:42 UTC (rev 12885)
@@ -157,6 +157,7 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@

Modified: gnunet-gtk/src/gnunet-gtk.c
===================================================================
--- gnunet-gtk/src/gnunet-gtk.c 2010-09-07 12:33:57 UTC (rev 12884)
+++ gnunet-gtk/src/gnunet-gtk.c 2010-09-07 12:34:42 UTC (rev 12885)
@@ -159,7 +159,11 @@
 const char *
 GNUNET_GTK_get_data_dir ()
 {
-  return GNUNET_GTK_installation_get_path (GNUNET_OS_IPK_DATADIR);
+  static char *dd;
+
+  if (dd == NULL)
+    dd = GNUNET_GTK_installation_get_path (GNUNET_OS_IPK_DATADIR);
+  return dd;
 }
 
 
@@ -473,9 +477,7 @@
 {
   char *buf;
 
-  GNUNET_asprintf (&buf,
-                  "%s/icons/",
-                  GNUNET_GTK_get_data_dir ());
+  buf = GNUNET_GTK_installation_get_path (GNUNET_OS_IPK_ICONDIR);
   gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), buf);
   GNUNET_free (buf);
 }

Modified: gnunet-gtk/src/os_installation.c
===================================================================
--- gnunet-gtk/src/os_installation.c    2010-09-07 12:33:57 UTC (rev 12884)
+++ gnunet-gtk/src/os_installation.c    2010-09-07 12:34:42 UTC (rev 12885)
@@ -419,6 +419,10 @@
         DIR_SEPARATOR_STR "share" DIR_SEPARATOR_STR "gnunet-gtk"
         DIR_SEPARATOR_STR;
       break;
+    case GNUNET_OS_IPK_ICONDIR:
+      dirname =
+        DIR_SEPARATOR_STR "share" DIR_SEPARATOR_STR "icons" DIR_SEPARATOR_STR;
+      break;
    case GNUNET_OS_IPK_LOCALEDIR:
       dirname =
         DIR_SEPARATOR_STR "share" DIR_SEPARATOR_STR "locale"