eliminate tray icon functionality that was deprecated in Gtk

1 files changed, 2 insertions, 20 deletions

diff --git a/src/statistics/gnunet-statistics-gtk.c b/src/statistics/gnunet-statistics-gtk.c
index 79d2a9a2..a2b3a71c 100644
--- a/src/statistics/gnunet-statistics-gtk.c
+++ b/src/statistics/gnunet-statistics-gtk.c
@@ -109,11 +109,6 @@ static const struct PlotInfo storage_data[] = {
 static struct GNUNET_GTK_MainLoop *ml;
 
 /**
- * Should gnunet-peerinfo-gtk start in tray mode?
- */
-static int tray_only;
-
-/**
  * Handle to statistics subsystem.
  */
 static struct GNUNET_STATISTICS_Handle *statistics;
@@ -222,7 +217,6 @@ create_plot (const char *box_name,
 static void
 shutdown_task (void *cls)
 {
-  GNUNET_GTK_tray_icon_destroy ();
   GNUNET_GTK_main_loop_quit (ml);
   ml = NULL;
   GNUNET_STATISTICS_destroy (statistics,
@@ -277,12 +271,6 @@ run (void *cls)
   main_window = GNUNET_GTK_plug_me ("GNUNET_STATISTICS_GTK_PLUG",
                                     main_window);
   gtk_window_maximize (GTK_WINDOW (main_window));
-  if (NULL == getenv ("GNUNET_STATISTICS_GTK_PLUG"))
-    GNUNET_GTK_tray_icon_create (ml,
-                                 GTK_WINDOW (main_window),
-                                 "gnunet-gtk" /* FIXME: different icon? */,
-                                 "gnunet-statistics-gtk");
-
   create_plot ("GNUNET_STATISTICS_GTK_connectivity_box",
                connection_data);
   create_plot ("GNUNET_STATISTICS_GTK_traffic_box",
@@ -291,11 +279,8 @@ run (void *cls)
                storage_data);
 
   /* make GUI visible */
-  if (! tray_only)
-  {
-    gtk_widget_show (main_window);
-    gtk_window_present (GTK_WINDOW (main_window));
-  }
+  gtk_widget_show (main_window);
+  gtk_window_present (GTK_WINDOW (main_window));
   GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
                                  NULL);
 }
@@ -306,9 +291,6 @@ main (int argc,
       char *const *argv)
 {
   static struct GNUNET_GETOPT_CommandLineOption options[] = {
-    {'t', "tray", NULL,
-     gettext_noop ("start in tray mode"), 0,
-     &GNUNET_GETOPT_set_one, &tray_only},
     GNUNET_GETOPT_OPTION_END
   };