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).

1 files 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 629d08f..9eef498 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 final class TrayMenuFactory
             "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;