finally icons working nicely

2 files changed, 19 insertions, 15 deletions

diff --git a/pixmaps/icons/Makefile.am b/pixmaps/icons/Makefile.am
index fcf18774..9ab5a531 100644
--- a/pixmaps/icons/Makefile.am
+++ b/pixmaps/icons/Makefile.am
@@ -1,5 +1,5 @@
 theme=hicolor
-themedir=$(datadir)/icons/$(theme)
+themedir="icons/$(theme)"
 theme_icons = \
  apps,gnunet-gtk.svg \
  apps,gnunet-gtk-16.png \
@@ -7,7 +7,7 @@ theme_icons = \
  apps,gnunet-gtk-24.png \
  apps,gnunet-gtk-32.png
 
-install_icon_exec=${top_srcdir}/pixmaps/icons/icon-theme-installer -t ${theme} -s ${srcdir} -b ${themedir} -m "${mkinstalldirs}" -x "${INSTALL_DATA}"
+install_icon_exec=${top_srcdir}/pixmaps/icons/icon-theme-installer -t ${theme} -s ${srcdir} -d "$(datadir)/gnunet-gtk/" -b ${themedir} -m "${mkinstalldirs}" -x "${INSTALL_DATA}"
 
 install-data-local:
         $(install_icon_exec) -i "${theme_icons}"
diff --git a/src/core/main.c b/src/core/main.c
index 0b92ef8e..27353922 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -76,6 +76,22 @@ customLog (const char *msg)
 }
 #endif
 
+static void
+setIconSearchPath()
+{
+  char *dataDir;
+  char *buf;
+  
+  dataDir = GNUNET_get_installation_path (GNUNET_IPK_DATADIR);
+  buf = GNUNET_malloc(strlen(dataDir) + strlen("../gnunet-gtk/icons/") + 2);
+  strcpy(buf, dataDir);
+  strcat(buf, "../gnunet-gtk/icons/");
+  gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
+                                     buf);
+  GNUNET_free(buf);
+  GNUNET_free(dataDir);
+}
+
 int
 main (int argc, char *const *argv)
 {
@@ -85,8 +101,6 @@ main (int argc, char *const *argv)
   struct GNUNET_GE_Context *my_ctx;
   struct GNUNET_GC_Configuration *cfg;
   char *log;
-  char *dataDir;
-  char *gtkDataDir;
   GNUNET_GE_KIND mask;
 #if ENABLE_NLS
   char *path;
@@ -120,6 +134,7 @@ main (int argc, char *const *argv)
   bind_textdomain_codeset ("GNUnet", "UTF-8");
   bind_textdomain_codeset ("gnunet-gtk", "UTF-8");
 #endif
+  setIconSearchPath();
   GNUNET_GTK_initialize_common_library (cfg, &GNUNET_GTK_main_quit);
   /* configure GTK logging */
   GNUNET_GC_get_configuration_value_string (cfg,
@@ -138,17 +153,6 @@ main (int argc, char *const *argv)
   GNUNET_GE_setDefaultContext (my_ctx);
   root =
     glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "mainWindow");  
-  if (NULL == gtk_window_get_icon(GTK_WINDOW(root)))
-    {
-      /* theme-based loading failed, set directly */
-      dataDir = GNUNET_get_installation_path (GNUNET_IPK_DATADIR);
-      gtkDataDir =
-        GNUNET_malloc (strlen (dataDir) +
-                       strlen ("/../gnunet-gtk/gnunet-gtk.png") + 2);
-      strcpy (gtkDataDir, dataDir);
-      strcat (gtkDataDir, "/../gnunet-gtk/gnunet-gtk.png");
-      gtk_window_set_icon_from_file(GTK_WINDOW(root), gtkDataDir, NULL);
-    }
   gtk_window_maximize (GTK_WINDOW (root));
   gtk_widget_show (root);
   gtk_window_present (GTK_WINDOW (root));