1 files changed, 7 insertions, 6 deletions

diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index 5f9c4bbc..ea3397d8 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -721,7 +721,8 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
   /* setup main window */
   maximized = GNUNET_CONFIGURATION_get_value_yesno (main_context.cfg,
-                                                    "gnunet-fs-gtk", "MAIN_WINDOW_MAXIMIZED");
+                                                    "gnunet-fs-gtk",
+                                                    "MAIN_WINDOW_MAXIMIZED");
   if (GNUNET_SYSERR == maximized)
     maximized = GNUNET_YES;
   if ( (GNUNET_NO == maximized) &&
@@ -747,11 +748,11 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   /* FIXME-GTK3: this can be done within (modern versions of) glade */
   gtk_tree_selection_set_mode (gtk_tree_view_get_selection (main_context.md_treeview),
                                GTK_SELECTION_MULTIPLE);
-
-  GNUNET_GTK_tray_icon_create (ml,
-                               GTK_WINDOW (main_context.main_window),
-                               "gnunet-fs-gtk",
-                               "gnunet-fs-gtk");
+  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?