diff options
author | Peter O'Neill <peter.oneill@metaswitch.com> | 2013-04-26 09:24:49 +0100 |
---|---|---|
committer | Peter O'Neill <peter.oneill@metaswitch.com> | 2013-04-26 09:24:49 +0100 |
commit | b795ea0a88362e43fe45c2bfcc398747a3fe3b85 (patch) | |
tree | 9f5624766f0789dbb5075d4ba4eea3182fb8c7f7 /src/net/java/sip/communicator | |
parent | 75fef62f934b63b931a3e0721b90d056dcf3c9b4 (diff) | |
download | jitsi-b795ea0a88362e43fe45c2bfcc398747a3fe3b85.zip jitsi-b795ea0a88362e43fe45c2bfcc398747a3fe3b85.tar.gz jitsi-b795ea0a88362e43fe45c2bfcc398747a3fe3b85.tar.bz2 |
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).
Diffstat (limited to 'src/net/java/sip/communicator')
-rw-r--r-- | src/net/java/sip/communicator/impl/osdependent/jdic/TrayMenuFactory.java | 14 |
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; |