aboutsummaryrefslogtreecommitdiffstats
path: root/src/net
diff options
context:
space:
mode:
Diffstat (limited to 'src/net')
-rw-r--r--src/net/java/sip/communicator/impl/protocol/irc/IrcConnection.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/net/java/sip/communicator/impl/protocol/irc/IrcConnection.java b/src/net/java/sip/communicator/impl/protocol/irc/IrcConnection.java
index 94bd1d7..c0bdb80 100644
--- a/src/net/java/sip/communicator/impl/protocol/irc/IrcConnection.java
+++ b/src/net/java/sip/communicator/impl/protocol/irc/IrcConnection.java
@@ -218,6 +218,10 @@ public class IrcConnection
{
return new NoopNegotiator();
}
+ // TODO In time, replace SaslNegotiator with CompositeNegotiator and
+ // SaslCapability together with any supported other capabilities.
+ // 'away-notify' would be an interesting option, so we do not have to
+ // periodically query channel status.
return new SaslNegotiator(sasl.getUser(), sasl.getPass(),
sasl.getRole());
}
@@ -237,9 +241,6 @@ public class IrcConnection
{
final Result<IIRCState, Exception> result =
new Result<IIRCState, Exception>();
- // FIXME Decide between SASL authentication and normal 'PASS'-parameter
- // authentication. You cannot do both as some services will respond with
- // already-authenticated warning.
synchronized (result)
{
// start connecting to the specified server ...