2 files changed, 12 insertions, 4 deletions

diff --git a/src/core/eggtrayicon.c b/src/core/eggtrayicon.c
index 4807f9c8..ef92f44f 100644
--- a/src/core/eggtrayicon.c
+++ b/src/core/eggtrayicon.c
@@ -634,13 +634,21 @@ void initTrayIcon() {
    GtkWidget *eventbox, *trayContextMenu, *tray_quit;
    GdkPixbuf *pixbuf;
    GladeXML *trayContextMenuXML;
+   char * instDir;
+   char * iconPath;
 
    trayContextMenuXML = glade_xml_new (getGladeFileName(), "trayContextMenu", PACKAGE_NAME);
    trayContextMenu = glade_xml_get_widget (trayContextMenuXML, "trayContextMenu");
    tray_quit = glade_xml_get_widget (trayContextMenuXML, "tray_quit");
 
    tray_icon = egg_tray_icon_new (_("GNU's p2p network"));
-   pixbuf = gdk_pixbuf_new_from_file (PACKAGE_DATA_DIR"/gnunet-gtk-tray.png", NULL);
+   instDir = os_get_installation_path(IPK_DATADIR);
+   iconPath = MALLOC(strlen(instDir) + 40);
+   strcpy(iconPath, iconDir);
+   strcat(iconPath, "/gnunet-gtk-tray.png");
+   FREE(instDir);
+   pixbuf = gdk_pixbuf_new_from_file (iconPath, NULL);
+   FREE(iconPath);
    tray_icon_image = gtk_image_new_from_pixbuf (pixbuf);
    eventbox = gtk_event_box_new ();
    gtk_container_add (GTK_CONTAINER (eventbox), tray_icon_image);
diff --git a/src/core/main.c b/src/core/main.c
index e327d311..501f7758 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -75,7 +75,7 @@ static void customLog(const char * msg) {
 #endif
 
 int main(int argc,
-         char * argv[]) {
+         char * const * argv) {
   GtkWidget * root;
   int i;
   struct GE_Context * ectx;
@@ -86,9 +86,9 @@ int main(int argc,
 #endif
 
   g_thread_init(NULL);
-  gtk_init(&argc, &argv);
+  gtk_init(&argc, (char***) &argv);
   i = GNUNET_init(argc,
-                  (const char**) argv,
+                  argv,
                   "gnunet-gtk",
                   &cfgFilename,
                   gnunetgtkOptions,