diff options
| author | Damian Minkov <damencho@jitsi.org> | 2012-05-31 14:42:33 +0000 |
|---|---|---|
| committer | Damian Minkov <damencho@jitsi.org> | 2012-05-31 14:42:33 +0000 |
| commit | 4b00ebbb7e12aa763e9528c6ea145ba17c937469 (patch) | |
| tree | 55f6a0fbe0e14c905ec792cbed7814688f5532be /src/net | |
| parent | 63241de6d13c87b10115e20451cbe4bc05f97e8c (diff) | |
| download | jitsi-4b00ebbb7e12aa763e9528c6ea145ba17c937469.zip jitsi-4b00ebbb7e12aa763e9528c6ea145ba17c937469.tar.gz jitsi-4b00ebbb7e12aa763e9528c6ea145ba17c937469.tar.bz2 | |
Removes OperationSetPresence and OperationSetPersistentPresence from supported operation sets of sip protocol when SIMPLE is disabled for account.
Diffstat (limited to 'src/net')
3 files changed, 27 insertions, 20 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/SimpleStatusMenu.java b/src/net/java/sip/communicator/impl/gui/main/presence/SimpleStatusMenu.java index 07520a7..d93775f 100644 --- a/src/net/java/sip/communicator/impl/gui/main/presence/SimpleStatusMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/presence/SimpleStatusMenu.java @@ -177,11 +177,15 @@ public class SimpleStatusMenu setIcon(new ImageIcon(ImageUtils.getBytesInImage( protocolProvider.getProtocolIcon().getIcon( ProtocolIcon.ICON_SIZE_16x16)))); - onlineItem.setIcon(getIcon()); - offlineItem.setIcon( - new ImageIcon(LightGrayFilter.createDisabledImage( - ImageUtils.getBytesInImage( - protocolProvider.getProtocolIcon().getIcon( - ProtocolIcon.ICON_SIZE_16x16))))); + + if(onlineItem != null) + onlineItem.setIcon(getIcon()); + + if(offlineItem != null) + offlineItem.setIcon( + new ImageIcon(LightGrayFilter.createDisabledImage( + ImageUtils.getBytesInImage( + protocolProvider.getProtocolIcon().getIcon( + ProtocolIcon.ICON_SIZE_16x16))))); } } diff --git a/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java b/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java index 067a18b..fe8a52c 100644 --- a/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java +++ b/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java @@ -1680,7 +1680,10 @@ public class ImageLoader = pps.getOperationSet(OperationSetPresence.class); Image statusImage; - byte[] protocolStatusIcon = presence.getPresenceStatus().getStatusIcon(); + byte[] protocolStatusIcon = null; + + if(presence != null) + protocolStatusIcon = presence.getPresenceStatus().getStatusIcon(); if (presence != null && protocolStatusIcon != null) { diff --git a/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java index 6602f4a..f4c91dc 100644 --- a/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java @@ -486,21 +486,21 @@ public class ProtocolProviderServiceSipImpl } } - //init presence op set. - OperationSetPersistentPresence opSetPersPresence - = new OperationSetPresenceSipImpl(this, enablePresence, - forceP2P, pollingValue, subscriptionExpiration); - - addSupportedOperationSet( - OperationSetPersistentPresence.class, - opSetPersPresence); - //also register with standard presence - addSupportedOperationSet( - OperationSetPresence.class, - opSetPersPresence); - if (enablePresence) { + //init presence op set. + OperationSetPersistentPresence opSetPersPresence + = new OperationSetPresenceSipImpl(this, enablePresence, + forceP2P, pollingValue, subscriptionExpiration); + + addSupportedOperationSet( + OperationSetPersistentPresence.class, + opSetPersPresence); + //also register with standard presence + addSupportedOperationSet( + OperationSetPresence.class, + opSetPersPresence); + // init instant messaging OperationSetBasicInstantMessagingSipImpl opSetBasicIM = new OperationSetBasicInstantMessagingSipImpl(this); |