fixing icon handling

4 files changed, 8 insertions, 3 deletions

diff --git a/gnunet-gtk.glade b/gnunet-gtk.glade
index 788b942f..70ff4b4a 100644
--- a/gnunet-gtk.glade
+++ b/gnunet-gtk.glade
@@ -6,7 +6,7 @@
     <property name="title" translatable="yes">GNUnet, GNU's Peer-to-Peer Network</property>
     <property name="default_width">700</property>
     <property name="default_height">500</property>
-    <property name="icon">gnunet-gtk.png</property>
+    <property name="icon_name">gnunet-gtk</property>
     <signal name="delete_event" handler="GNUNET_GTK_main_quit" after="yes"/>
     <signal name="window_state_event" handler="GNUNET_GTK_save_main_window_state" after="yes"/>
     <child>
diff --git a/po/Makefile.in b/po/Makefile.in
index 71ecc80e..baba3cb0 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -20,7 +20,7 @@ srcdir = .
 top_srcdir = ..
 
 
-prefix = /home/grothoff
+prefix = /home/grothoff/
 exec_prefix = ${prefix}
 datadir = ${prefix}/share
 localedir = $(datadir)/locale
diff --git a/src/core/main.c b/src/core/main.c
index 3fd82978..8b95c834 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -85,6 +85,7 @@ main (int argc, char *const *argv)
   struct GNUNET_GE_Context *my_ctx;
   struct GNUNET_GC_Configuration *cfg;
   char *log;
+  char *dataDir;
   GNUNET_GE_KIND mask;
 #if ENABLE_NLS
   char *path;
@@ -136,6 +137,10 @@ main (int argc, char *const *argv)
   GNUNET_GE_setDefaultContext (my_ctx);
   root =
     glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "mainWindow");
+  dataDir = GNUNET_get_installation_path (GNUNET_IPK_DATADIR);
+  gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
+                                     dataDir);
+  GNUNET_free (dataDir);
   gtk_window_maximize (GTK_WINDOW (root));
   gtk_widget_show (root);
   gtk_window_present (GTK_WINDOW (root));
diff --git a/src/include/gnunetgtk_common.h b/src/include/gnunetgtk_common.h
index dbea47cb..b98d132a 100644
--- a/src/include/gnunetgtk_common.h
+++ b/src/include/gnunetgtk_common.h
@@ -103,7 +103,7 @@ void GNUNET_GTK_notify (int type, const char *message, ...);
 
 /**
  * Call a callback function from the mainloop/main thread ("SaveCall").
- * Since GTK doesn't work with multi-threaded applications under Windows,
+ * Since GTK doesn't work with multi-threaded applications
  * all GTK operations have to be done in the main thread
  */
 void *GNUNET_GTK_save_call (GNUNET_ThreadMainFunction func, void *arg);