Merge commit 'cf5da99'HEADmaster

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>

1 files changed, 6 insertions, 0 deletions

diff --git a/src/net/java/sip/communicator/util/launchutils/LaunchArgHandler.java b/src/net/java/sip/communicator/util/launchutils/LaunchArgHandler.java
index 90041fc..d5cbf14 100644
--- a/src/net/java/sip/communicator/util/launchutils/LaunchArgHandler.java
+++ b/src/net/java/sip/communicator/util/launchutils/LaunchArgHandler.java
@@ -299,6 +299,11 @@ public class LaunchArgHandler
                 // do nothing already handled by startup script/binary
                 continue;
             }
+            else if (args[i].startsWith("--notray"))
+            {
+                System.setProperty("disable-tray", "true");
+                continue;
+            }
             //if this is the last arg and it's not an option then it's probably
             //an URI
             else if ( i == args.length - 1
@@ -521,6 +526,7 @@ public class LaunchArgHandler
         System.out.println("  -6, --ipv6        prefer IPv6 addresses where possible only");
         System.out.println("  -4, --ipv4        forces use of IPv4 only");
         System.out.println("  -v, --version     display the current version and exit");
+        System.out.println("  -n, --notray      disable the tray icon and show the GUI");
     }
 
     /**