[GNUnet-SVN] r3743 - gnunet-gtk/src/core

[grothoff]

Author: grothoff
Date: 2006-11-12 20:39:03 -0800 (Sun, 12 Nov 2006)
New Revision: 3743

Modified:
   gnunet-gtk/src/core/eggtrayicon.c
   gnunet-gtk/src/core/main.c
Log:
icon

Modified: gnunet-gtk/src/core/eggtrayicon.c
===================================================================
--- gnunet-gtk/src/core/eggtrayicon.c   2006-11-13 04:35:37 UTC (rev 3742)
+++ gnunet-gtk/src/core/eggtrayicon.c   2006-11-13 04:39:03 UTC (rev 3743)
@@ -634,13 +634,21 @@
    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);

Modified: gnunet-gtk/src/core/main.c
===================================================================
--- gnunet-gtk/src/core/main.c  2006-11-13 04:35:37 UTC (rev 3742)
+++ gnunet-gtk/src/core/main.c  2006-11-13 04:39:03 UTC (rev 3743)
@@ -75,7 +75,7 @@
 #endif
 
 int main(int argc,
-        char * argv[]) {
+        char * const * argv) {
   GtkWidget * root;
   int i;
   struct GE_Context * ectx;
@@ -86,9 +86,9 @@
 #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,