1 files changed, 37 insertions, 6 deletions

diff --git a/src/lib/trayicon.c b/src/lib/trayicon.c
index 6c426f00..0be8541f 100644
--- a/src/lib/trayicon.c
+++ b/src/lib/trayicon.c
@@ -45,10 +45,37 @@ static GtkWindow *main_window;
 static void
 tray_icon_on_click (GtkStatusIcon * status_icon, gpointer user_data)
 {
-  if (gtk_window_is_active (main_window))
+  gboolean tlf;
+
+  g_object_get (main_window,
+                "visible", &tlf,
+                NULL);
+  if (tlf)
+  {
     gtk_widget_hide (GTK_WIDGET (main_window));
+  }
   else
-    gtk_window_present (main_window);
+  {
+    gtk_widget_show (GTK_WIDGET (main_window));
+    gtk_window_deiconify (main_window);
+    gtk_widget_grab_focus (GTK_WIDGET (main_window));
+  }
+}
+
+
+/**
+ * Function called from trayicon "quit" context menu
+ * to trigger shutdown.
+ *
+ * @param menuitem quit item
+ * @param user_data the main loop context
+ */
+void
+GNUNET_GTK_tray_icon_quit (GtkMenuItem *menuitem,
+                           gpointer user_data)
+{
+  /* struct GNUNET_GTK_MainLoop *ml = user_data; */
+  GNUNET_SCHEDULER_shutdown ();
 }
 
 
@@ -59,6 +86,7 @@ tray_icon_on_click (GtkStatusIcon * status_icon, gpointer user_data)
 static int
 tray_icon_on_menu (GtkWidget * widget, GdkEvent * event, gpointer user_data)
 {
+  struct GNUNET_GTK_MainLoop *ml = user_data;
   GtkMenu *tray_menu;
   GdkEventButton *event_button;
   GtkBuilder *builder;
@@ -68,10 +96,11 @@ tray_icon_on_menu (GtkWidget * widget, GdkEvent * event, gpointer user_data)
     event_button = (GdkEventButton *) event;
     if (event_button->button == 3)
     {
-      builder = GNUNET_GTK_get_new_builder ("gnunet_gtk_status_bar_menu.glade", NULL);
+      builder = GNUNET_GTK_get_new_builder ("gnunet_gtk_status_bar_menu.glade", ml);
       tray_menu =
           GTK_MENU (gtk_builder_get_object
                     (builder, "GNUNET_GTK_status_bar_popup_menu"));
+      g_object_ref (tray_menu);
       gtk_menu_popup (tray_menu, NULL, NULL, NULL, NULL, event_button->button,
                       event_button->time);
       g_object_unref (builder);
@@ -84,12 +113,14 @@ tray_icon_on_menu (GtkWidget * widget, GdkEvent * event, gpointer user_data)
 /**
  * Create our tray icon.
  *
+ * @param ml main loop
  * @param main handle to the main window (show or hide)
  * @param icon_name name of the tray icon file
  * @param tooltip tooltip for the tray icon
  */
 void
-GNUNET_GTK_tray_icon_create (GtkWindow * main, const char *icon_name,
+GNUNET_GTK_tray_icon_create (struct GNUNET_GTK_MainLoop *ml,
+                             GtkWindow * main, const char *icon_name,
                              const char *tooltip)
 {
   if (NULL != tray_icon)
@@ -100,9 +131,9 @@ GNUNET_GTK_tray_icon_create (GtkWindow * main, const char *icon_name,
   main_window = main;
   tray_icon = gtk_status_icon_new ();
   g_signal_connect (G_OBJECT (tray_icon), "activate",
-                    G_CALLBACK (tray_icon_on_click), NULL);
+                    G_CALLBACK (tray_icon_on_click), ml);
   g_signal_connect (G_OBJECT (tray_icon), "button_press_event",
-                    G_CALLBACK (tray_icon_on_menu), tray_icon);
+                    G_CALLBACK (tray_icon_on_menu), ml);
   gtk_status_icon_set_from_icon_name (tray_icon, icon_name);
   gtk_status_icon_set_tooltip_text (tray_icon, tooltip);
   gtk_status_icon_set_visible (tray_icon, TRUE);