1 files changed, 63 insertions, 5 deletions

diff --git a/src/core/eggtrayicon.c b/src/core/eggtrayicon.c
index 71ccdaa8..cc0fbc85 100644
--- a/src/core/eggtrayicon.c
+++ b/src/core/eggtrayicon.c
@@ -46,11 +46,11 @@
 
 #include "platform.h"
 #include "gnunetgtk_common.h"
-#include "eggtrayicon.h"
-
+#include <gtk/gtkversion.h>
 
+#if !GTK_CHECK_VERSION (2,10,0) && !defined(WINDOWS)
+#include "eggtrayicon.h"
 #include <gtk/gtkplug.h>
-#include <gtk/gtkversion.h>
 #include <gdk/gdkx.h>
 #include <X11/Xatom.h>
 
@@ -586,6 +586,7 @@ egg_tray_icon_get_orientation (EggTrayIcon * icon)
 
   return icon->orientation;
 }
+#endif /* !GTK_CHECK_VERSION (2,10,0) && !defined(WINDOWS) */
 
 
 /* Callback for the "Quit" element on the tray icon menu */
@@ -600,6 +601,21 @@ on_tray_quit_activate (GtkWidget * widget, GdkEvent * event, gpointer data)
 static gboolean
 tray_clicked (GtkWidget * widget, GdkEvent * event)
 {
+#if GTK_CHECK_VERSION(2,10,0)
+          GtkWidget *root;
+          root =
+            glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                                  "mainWindow");
+          GdkWindowState main_window_state;
+          if (gtk_window_is_active (GTK_WINDOW (root)))
+            gtk_widget_hide (root);
+          else
+            gtk_window_present (GTK_WINDOW (root));
+          main_window_state = GNUNET_GTK_get_main_window_state ();
+          if (main_window_state & GDK_WINDOW_STATE_MAXIMIZED)
+            gtk_window_maximize (GTK_WINDOW (root));
+          return TRUE;
+#elif !defined (WINDOWS)
   if (event->type == GDK_BUTTON_PRESS)
     {
       GdkEventButton *event_button;
@@ -631,12 +647,53 @@ tray_clicked (GtkWidget * widget, GdkEvent * event)
         }
     }
   return FALSE;
+#endif
 }
 
+#if GTK_CHECK_VERSION(2,10,0)
+/* Function activated when the user tries to popup the menu */
+static gboolean
+on_tray_popup_menu (GtkStatusIcon *status_icon, guint button,
+                    guint activate_time, gpointer trayContextMenu)
+{
+  gtk_menu_popup (GTK_MENU(trayContextMenu), NULL, NULL, NULL, NULL,
+                  button, activate_time);
+  return TRUE;
+}
+#endif
+
 /* Initiate the system tray icon */
 void
 initTrayIcon ()
 {
+#if GTK_CHECK_VERSION (2,10,0)
+  char *instDir;
+  char *iconPath;
+  GtkStatusIcon *trayIcon;
+  GtkWidget *trayContextMenu;
+  GladeXML *trayContextMenuXML;
+  GtkWidget *tray_quit;
+  
+  trayContextMenuXML =
+    glade_xml_new (GNUNET_GTK_get_glade_filename (), "trayContextMenu",
+                   PACKAGE_NAME);
+  trayContextMenu = glade_xml_get_widget (trayContextMenuXML,
+                                          "trayContextMenu");
+  trayIcon = GNUNET_GTK_get_trayIcon ();
+  instDir = GNUNET_get_installation_path (GNUNET_IPK_DATADIR);
+  iconPath = g_strconcat (instDir, "/../gnunet-gtk/gnunet-gtk-tray.png", NULL);
+  GNUNET_free (instDir);
+  gtk_status_icon_set_from_file (trayIcon, iconPath);
+  g_free (iconPath);
+  gtk_status_icon_set_tooltip (trayIcon, _("GNU's peer-to-peer network"));
+  tray_quit = glade_xml_get_widget (trayContextMenuXML, "tray_quit");
+  g_signal_connect_swapped (G_OBJECT (tray_quit), "activate",
+                            G_CALLBACK (on_tray_quit_activate), trayContextMenu);
+  g_signal_connect_swapped (G_OBJECT (trayIcon), "activate",
+                            G_CALLBACK (tray_clicked), trayContextMenu);
+  g_signal_connect (G_OBJECT (trayIcon), "popup-menu",
+                    G_CALLBACK (on_tray_popup_menu), trayContextMenu);
+#elif !defined(WINDOWS)
   static EggTrayIcon *tray_icon;
   static GtkWidget *tray_icon_image;
   static GtkTooltips *tray_icon_tooltip;
@@ -653,7 +710,7 @@ initTrayIcon ()
     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"));
+  tray_icon = egg_tray_icon_new (_("GNU's peer-to-peer network"));
   instDir = GNUNET_get_installation_path (GNUNET_IPK_DATADIR);
   iconPath = GNUNET_malloc (strlen (instDir) + 40);
   strcpy (iconPath, instDir);
@@ -671,7 +728,8 @@ initTrayIcon ()
                             G_CALLBACK (tray_clicked), trayContextMenu);
   tray_icon_tooltip = gtk_tooltips_new ();
   gtk_tooltips_set_tip (tray_icon_tooltip, GTK_WIDGET (tray_icon),
-                        _("GNU's p2p network"), NULL);
+                        _("GNU's peer-to-peer network"), NULL);
   gtk_widget_show (eventbox);
   gtk_widget_show_all (GTK_WIDGET (tray_icon));
+#endif
 }