diff options
| author | Damian Minkov <damencho@jitsi.org> | 2012-02-17 10:17:35 +0000 |
|---|---|---|
| committer | Damian Minkov <damencho@jitsi.org> | 2012-02-17 10:17:35 +0000 |
| commit | 9f8008254f463188ab67816fa157f13d85efe59d (patch) | |
| tree | 5785bc17df2a3fceeb49e2dfbf42fd603efc9ded /src/net/java/sip/communicator/impl/gui/main/contactlist | |
| parent | 1867bc0b68001d3c836239fe2733abf238dea66c (diff) | |
| download | jitsi-9f8008254f463188ab67816fa157f13d85efe59d.zip jitsi-9f8008254f463188ab67816fa157f13d85efe59d.tar.gz jitsi-9f8008254f463188ab67816fa157f13d85efe59d.tar.bz2 | |
Fixes NPE in contact right button menu and chat window.
Fixes a problem with yahoo deny authorization requests.
Diffstat (limited to 'src/net/java/sip/communicator/impl/gui/main/contactlist')
| -rw-r--r-- | src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactRightButtonMenu.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactRightButtonMenu.java index 9faed57..bd7348a 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactRightButtonMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactRightButtonMenu.java @@ -650,10 +650,11 @@ public class MetaContactRightButtonMenu && defaultContact.getProtocolProvider() .getOperationSet(OperationSetExtendedAuthorizations.class) != null) - && !defaultContact.getProtocolProvider() - .getOperationSet(OperationSetExtendedAuthorizations.class) - .getSubscriptionStatus(defaultContact).equals( - SubscriptionStatus.Subscribed)) + && !SubscriptionStatus.Subscribed + .equals(defaultContact.getProtocolProvider() + .getOperationSet( + OperationSetExtendedAuthorizations.class) + .getSubscriptionStatus(defaultContact))) { this.add(requestAuthMenuItem); this.requestAuthMenuItem.setName("requestAuth"); |