1 files changed, 2 insertions, 20 deletions

diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index cbbc1984..7d39f1e3 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -52,11 +52,6 @@
 GtkTreeStore *downloads_treestore;
 
 /**
- * Should gnunet-fs-gtk start in tray mode?
- */
-static int tray_only;
-
-/**
  * Handle to our main loop.
  */
 static struct GNUNET_GTK_MainLoop *ml;
@@ -240,7 +235,6 @@ shutdown_task (void *cls)
   struct PseuLookupContext *lctx;
   struct SearchResult *sr;
 
-  GNUNET_GTK_tray_icon_destroy ();
   while (NULL != (sr = pl_head))
   {
     GNUNET_FS_probe_stop (sr->probe);
@@ -336,7 +330,6 @@ GNUNET_FS_GTK_delete_event_cb (GtkWidget *object,
    * just to be sure it is dead (if it isn't, application will hang up).
    */
   GNUNET_SCHEDULER_shutdown ();
-  GNUNET_GTK_tray_icon_destroy ();
 }
 
 
@@ -776,11 +769,6 @@ run (void *cls)
      (However, this needs GTK >= 3.2, we currently target 3.0) */
   gtk_tree_selection_set_mode (gtk_tree_view_get_selection (main_context.md_treeview),
                                GTK_SELECTION_MULTIPLE);
-  if (NULL == getenv ("GNUNET_FS_GTK_PLUG"))
-    GNUNET_GTK_tray_icon_create (ml,
-                                 GTK_WINDOW (main_context.main_window),
-                                 "gnunet-fs-gtk",
-                                 "gnunet-fs-gtk");
 
   /* FIXME: should these '1's be here? Maybe better to put them into
    * default config files?
@@ -830,11 +818,8 @@ run (void *cls)
                     G_CALLBACK (unique_app_message_cb), &main_context);
 #endif
   /* make GUI visible */
-  if (!tray_only)
-  {
-    gtk_widget_show (main_context.main_window);
-    gtk_window_present (GTK_WINDOW (main_context.main_window));
-  }
+  gtk_widget_show (main_context.main_window);
+  gtk_window_present (GTK_WINDOW (main_context.main_window));
 
   {
     char *const *argv;
@@ -861,9 +846,6 @@ int
 main (int argc, char **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
   };
 #if HAVE_LIBUNIQUE