aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java
diff options
context:
space:
mode:
authorEmil Ivov <emcho@jitsi.org>2007-03-10 14:33:46 +0000
committerEmil Ivov <emcho@jitsi.org>2007-03-10 14:33:46 +0000
commitf929d125c5bec6189c4fb86342525fbd6edc1782 (patch)
tree460807d1d1af4123b9b411569486042e5ca8523a /src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java
parentd27282d6de8ddf47b5976d363a385fc81ad4cb4d (diff)
downloadjitsi-f929d125c5bec6189c4fb86342525fbd6edc1782.zip
jitsi-f929d125c5bec6189c4fb86342525fbd6edc1782.tar.gz
jitsi-f929d125c5bec6189c4fb86342525fbd6edc1782.tar.bz2
getSRVRecords() doesn't throw a naming exception any more. we now throw a parse exception instead
Diffstat (limited to 'src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java')
-rw-r--r--src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java
index efdd327..fc20d9e 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java
@@ -17,7 +17,7 @@ import net.java.sip.communicator.service.protocol.*;
import net.java.sip.communicator.service.protocol.event.*;
import net.java.sip.communicator.service.protocol.jabberconstants.*;
import net.java.sip.communicator.util.*;
-import javax.naming.*;
+import java.text.*;
/**
* An implementation of the protocol provider service over the Jabber protocol
@@ -70,7 +70,7 @@ public class ProtocolProviderServiceJabberImpl
*/
private ProtocolIconJabberImpl jabberIcon
= new ProtocolIconJabberImpl();
-
+
/**
* Returns the state of the registration of this protocol provider
* @return the <tt>RegistrationState</tt> that this provider is
@@ -265,7 +265,7 @@ public class ProtocolProviderServiceJabberImpl
serverAddress = hosts[0];
}
}
- catch (NamingException ex1)
+ catch (ParseException ex1)
{
logger.error("Domain not resolved " + ex1.getMessage());
}
@@ -469,6 +469,15 @@ public class ProtocolProviderServiceJabberImpl
OperationSetTypingNotifications.class.getName(),
typingNotifications);
+ //initialize the multi user chat operation set
+ OperationSetMultiUserChat multiUserChat =
+ new OperationSetMultiUserChatJabberImpl(this);
+
+ supportedOperationSets.put(
+ OperationSetMultiUserChat.class.getName(),
+ multiUserChat);
+
+
isInitialized = true;
}
}