From b795ea0a88362e43fe45c2bfcc398747a3fe3b85 Mon Sep 17 00:00:00 2001
From: Peter O'Neill <peter.oneill@metaswitch.com>
Date: Fri, 26 Apr 2013 09:24:49 +0100
Subject: [PATCH] Use config to control whether user can change presence state
 from the systray. No change to default behaviour (i.e. user can change
 presence state).

---
 .../impl/osdependent/jdic/TrayMenuFactory.java     | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/net/java/sip/communicator/impl/osdependent/jdic/TrayMenuFactory.java b/src/net/java/sip/communicator/impl/osdependent/jdic/TrayMenuFactory.java
index 629d08ff4..9eef4988b 100644
--- a/src/net/java/sip/communicator/impl/osdependent/jdic/TrayMenuFactory.java
+++ b/src/net/java/sip/communicator/impl/osdependent/jdic/TrayMenuFactory.java
@@ -166,8 +166,18 @@ public void actionPerformed(ActionEvent event)
             "service.gui.ADD_CONTACT",
             "service.gui.icons.ADD_CONTACT_16x16_ICON", listener, swing));
         addSeparator(trayMenu);
-        add(trayMenu, new StatusSubMenu(swing).getMenu());
-        addSeparator(trayMenu);
+
+        Boolean chatPresenceDisabled
+            = OsDependentActivator.getConfigurationService().getBoolean(
+                "net.java.sip.communicator.impl.gui.main.presence."
+                + "CHAT_PRESENCE_DISABLED",
+                false);
+
+        if (!chatPresenceDisabled.booleanValue())
+        {
+            add(trayMenu, new StatusSubMenu(swing).getMenu());
+            addSeparator(trayMenu);
+        }
 
         String showHideName;
         String showHideTextId;