From 4191ad1cbfcfaefc29a3fd31ebc70e44e6c6760a Mon Sep 17 00:00:00 2001
From: jrandom <jrandom>
Date: Wed, 6 Oct 2004 13:23:38 +0000
Subject: [PATCH] 2004-10-06  jrandom     * Enable explicit disabling of the
 systray entirely for windows machines       with strange configurations: add
 -Dsystray.disable=true to the java       command line.  (thanks mihi!)

---
 apps/systray/java/src/net/i2p/apps/systray/SysTray.java | 2 +-
 history.txt                                             | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/systray/java/src/net/i2p/apps/systray/SysTray.java b/apps/systray/java/src/net/i2p/apps/systray/SysTray.java
index 6900d69211..510c3e78ef 100644
--- a/apps/systray/java/src/net/i2p/apps/systray/SysTray.java
+++ b/apps/systray/java/src/net/i2p/apps/systray/SysTray.java
@@ -49,7 +49,7 @@ public class SysTray implements SysTrayMenuListener {
         if (!(new File("router.config")).exists())
             openRouterConsole("http://localhost:" + _portString + "/index.jsp");
 
-        if (System.getProperty("os.name").startsWith("Windows"))
+        if ( (System.getProperty("os.name").startsWith("Windows")) && (!Boolean.getBoolean("systray.disable")) )
             _instance = new SysTray();
     }
 
diff --git a/history.txt b/history.txt
index bed2670f6a..6b32a6042a 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,9 @@
-$Id: history.txt,v 1.34 2004/10/05 14:21:47 jrandom Exp $
+$Id: history.txt,v 1.35 2004/10/05 20:12:04 jrandom Exp $
+
+2004-10-06  jrandom
+    * Enable explicit disabling of the systray entirely for windows machines
+      with strange configurations: add -Dsystray.disable=true to the java 
+      command line.  (thanks mihi!)
 
 2004-10-05  jrandom
     * Allow peers on the same LAN to communicate with each other safely even