From d032dff1d7fcf1e9245e3340d34d35fd57e59ee2 Mon Sep 17 00:00:00 2001 From: Benoit Pradelle Date: Fri, 27 Jul 2007 16:34:09 +0000 Subject: [PATCH] rename busy state in busy (DND) + volatile contacts are now subscribed as any other contact --- .../impl/protocol/sip/OperationSetPresenceSipImpl.java | 4 ---- .../sip/communicator/impl/protocol/sip/SipStatusEnum.java | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetPresenceSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetPresenceSipImpl.java index c3e4cfd0a..207995ebf 100644 --- a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetPresenceSipImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetPresenceSipImpl.java @@ -3249,10 +3249,6 @@ public ContactSipImpl createVolatileContact(String contactAddress) ContactSipImpl newVolatileContact = new ContactSipImpl(contactAddress, this.parentProvider); newVolatileContact.setPersistent(false); - - // ensure that we won't try to subscribe to him - newVolatileContact.setResolvable(false); - newVolatileContact.setResolved(true); // Check whether a volatile group already exists and if not create one ContactGroupSipImpl theVolatileGroup = getNonPersistentGroup(); diff --git a/src/net/java/sip/communicator/impl/protocol/sip/SipStatusEnum.java b/src/net/java/sip/communicator/impl/protocol/sip/SipStatusEnum.java index 268c8c5fa..ad43dd967 100644 --- a/src/net/java/sip/communicator/impl/protocol/sip/SipStatusEnum.java +++ b/src/net/java/sip/communicator/impl/protocol/sip/SipStatusEnum.java @@ -40,7 +40,7 @@ public class SipStatusEnum public static final SipStatusEnum BUSY = new SipStatusEnum( 30, - "Busy", + "Busy (DND)", loadIcon("resources/images/sip/sip16x16-busy.png")); /**