implementing Mantis #1395

2 files changed, 13 insertions, 3 deletions

diff --git a/doc/gnunet-gtk.1 b/doc/gnunet-gtk.1
index 39b9f03b..9a13a6ac 100644
--- a/doc/gnunet-gtk.1
+++ b/doc/gnunet-gtk.1
@@ -14,6 +14,9 @@ print help page
 \fB\-c \fIFILENAME\fR, \fB\-\-config=FILENAME\fR
 load config file (default: ~/.gnunet/gnunet.conf)
 .TP
+\fB\-t, \fB\-\-tray\fR
+start with main window minimized (only put icon in tray)
+.TP
 \fB\-v\fR, \fB\-\-version\fR
 print the version number
 .SH NOTES
diff --git a/src/core/main.c b/src/core/main.c
index a6bd976a..7ac2359f 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -35,6 +35,8 @@ static int debug_mode = GNUNET_NO;
 
 static char *cfgFilename = GNUNET_DEFAULT_CLIENT_CONFIG_FILE;
 
+static int tray_only;
+
 /**
  * All gnunet-gtk command line options
  */
@@ -48,6 +50,9 @@ static struct GNUNET_CommandLineOption gnunetgtkOptions[] = {
   GNUNET_COMMAND_LINE_OPTION_HELP (gettext_noop ("GNUnet GTK user interface.")),        /* -h */
   GNUNET_COMMAND_LINE_OPTION_HOSTNAME,  /* -H */
   GNUNET_COMMAND_LINE_OPTION_LOGGING,   /* -L */
+  {'t', "tray", NULL,
+   gettext_noop ("do not open main window on startup, only add icon to tray"),
+   0, &GNUNET_getopt_configure_set_one, &tray_only},
   GNUNET_COMMAND_LINE_OPTION_VERSION (VERSION), /* -v */
   GNUNET_COMMAND_LINE_OPTION_VERBOSE,
   GNUNET_COMMAND_LINE_OPTION_END,
@@ -150,9 +155,11 @@ main (int argc, char *const *argv)
   root =
     glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "mainWindow");
   gtk_window_maximize (GTK_WINDOW (root));
-  gtk_widget_show (root);
-  gtk_window_present (GTK_WINDOW (root));
-
+  if (!tray_only)
+    {
+      gtk_widget_show (root);
+      gtk_window_present (GTK_WINDOW (root));
+    }
 
   /* start the event loop */
   gdk_threads_enter ();