fixing window icon stuff

1 files changed, 13 insertions, 4 deletions

diff --git a/src/core/main.c b/src/core/main.c
index 78e29adf..0b92ef8e 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -86,6 +86,7 @@ main (int argc, char *const *argv)
   struct GNUNET_GC_Configuration *cfg;
   char *log;
   char *dataDir;
+  char *gtkDataDir;
   GNUNET_GE_KIND mask;
 #if ENABLE_NLS
   char *path;
@@ -136,10 +137,18 @@ main (int argc, char *const *argv)
   my_ctx = GNUNET_GTK_create_gtk_logger (mask);
   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);
+    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));