eliminate tray icon functionality that was deprecated in Gtk

1 files changed, 4 insertions, 21 deletions

diff --git a/src/peerinfo/gnunet-peerinfo-gtk.c b/src/peerinfo/gnunet-peerinfo-gtk.c
index 0838fe15..2eaf102c 100644
--- a/src/peerinfo/gnunet-peerinfo-gtk.c
+++ b/src/peerinfo/gnunet-peerinfo-gtk.c
@@ -339,11 +339,6 @@ struct GNUNET_TRANSPORT_PluginMonitor *pm;
 static struct GNUNET_CORE_MonitorHandle *cm;
 
 /**
- * Should gnunet-peerinfo-gtk start in tray mode?
- */
-static int tray_only;
-
-/**
  * Green status led (connected)
  */
 static GdkPixbuf *led_green;
@@ -493,7 +488,6 @@ free_paths (void *cts,
 static void
 shutdown_task (void *cts)
 {
-  GNUNET_GTK_tray_icon_destroy ();
   GNUNET_GTK_main_loop_quit (ml);
   ml = NULL;
   if (NULL != pnc)
@@ -1527,12 +1521,6 @@ run (void *cts)
   ts = GTK_TREE_STORE (get_object ("GNUNET_PEERINFO_GTK_tree_store"));
   GNUNET_assert (NULL != ts);
   gtk_window_maximize (GTK_WINDOW (main_window));
-  if (NULL == getenv ("GNUNET_PEERINFO_GTK_PLUG"))
-    GNUNET_GTK_tray_icon_create (ml,
-                                 GTK_WINDOW (main_window),
-                                 "gnunet-gtk" /* FIXME: different icon? */,
-                                 "gnunet-peerinfo-gtk");
-
   tv = GTK_TREE_VIEW (get_object ("GNUNET_PEERINFO_GTK_main_window_treeview"));
   g_object_set (tv, "has-tooltip", TRUE, NULL);
   g_signal_connect (tv, "query-tooltip",
@@ -1543,12 +1531,10 @@ run (void *cts)
   unique_app_watch_window (unique_app, GTK_WINDOW (main_window));
 #endif
   /* make GUI visible */
-  if (!tray_only)
-  {
-    gtk_widget_show (main_window);
-    gtk_window_present (GTK_WINDOW (main_window));
-  }
-  GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL);
+  gtk_widget_show (main_window);
+  gtk_window_present (GTK_WINDOW (main_window));
+  GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
+                                 NULL);
 }
 
 
@@ -1566,9 +1552,6 @@ main (int argc, char **argv)
     {'s', "show-inactive", NULL,
      gettext_noop ("show peers even if the are inactive and we know nothing except their public key"), 0,
      &GNUNET_GETOPT_set_one, &show_inactive},
-    {'t', "tray", NULL,
-     gettext_noop ("start in tray mode"), 0,
-     &GNUNET_GETOPT_set_one, &tray_only},
     GNUNET_GETOPT_OPTION_END
   };