1 files changed, 20 insertions, 0 deletions

diff --git a/src/common/helper.c b/src/common/helper.c
index c7f11680..52dfefe3 100644
--- a/src/common/helper.c
+++ b/src/common/helper.c
@@ -26,6 +26,7 @@
 
 #include "platform.h"
 #include "gnunetgtk_common.h"
+#include "../core/eggtrayicon.h"
 #include <GNUnet/gnunet_util_crypto.h>
 #include <GNUnet/gnunet_util_cron.h>
 #include <glib.h>
@@ -64,6 +65,10 @@ typedef struct Plugin
 
 static GladeXML *mainXML;
 
+#if GTK_CHECK_VERSION(2,10,0)
+static GtkStatusIcon *trayIcon;
+#endif
+
 static char *gladeFile;
 
 static GdkWindowState main_window_state;
@@ -178,6 +183,17 @@ GNUNET_GTK_get_main_glade_XML ()
   return mainXML;
 }
 
+/**
+ * Simple accessor method.
+ */
+#if GTK_CHECK_VERSION(2,10,0)
+GtkStatusIcon *
+GNUNET_GTK_get_trayIcon ()
+{
+  return trayIcon;
+}
+#endif
+
 static void
 connector (const gchar * handler_name,
            GObject * object,
@@ -343,6 +359,10 @@ GNUNET_GTK_initialize_common_library (struct GNUNET_GE_Context *e,
                                  GNUNET_GE_FATAL | GNUNET_GE_USER |
                                  GNUNET_GE_IMMEDIATE, "glade_xml_new",
                                  gladeFile);
+#if GTK_CHECK_VERSION (2,10,0)  
+  trayIcon = gtk_status_icon_new ();
+#endif
+  initTrayIcon ();
   /* load the plugins */
   GNUNET_GC_get_configuration_value_string (cfg,
                                             "GNUNET-GTK",