aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip/communicator/impl/protocol/irc
diff options
context:
space:
mode:
authorDanny van Heumen <danny@dannyvanheumen.nl>2015-04-03 13:17:54 +0200
committerDanny van Heumen <danny@dannyvanheumen.nl>2015-04-03 21:37:01 +0200
commit8319f99727366d3544c2b2288d369832d46b3f45 (patch)
treeb8984397764d8a3c86ac9908e19a714855b370eb /src/net/java/sip/communicator/impl/protocol/irc
parentde23be68dd771571a0bb8a116ddcd8f2bd799f4b (diff)
downloadjitsi-8319f99727366d3544c2b2288d369832d46b3f45.zip
jitsi-8319f99727366d3544c2b2288d369832d46b3f45.tar.gz
jitsi-8319f99727366d3544c2b2288d369832d46b3f45.tar.bz2
GUI improvements for IRC account registration wizard.
Diffstat (limited to 'src/net/java/sip/communicator/impl/protocol/irc')
-rw-r--r--src/net/java/sip/communicator/impl/protocol/irc/ProtocolProviderFactoryIrcImpl.java5
-rw-r--r--src/net/java/sip/communicator/impl/protocol/irc/ProtocolProviderServiceIrcImpl.java6
2 files changed, 2 insertions, 9 deletions
diff --git a/src/net/java/sip/communicator/impl/protocol/irc/ProtocolProviderFactoryIrcImpl.java b/src/net/java/sip/communicator/impl/protocol/irc/ProtocolProviderFactoryIrcImpl.java
index e599440..db0d2c2 100644
--- a/src/net/java/sip/communicator/impl/protocol/irc/ProtocolProviderFactoryIrcImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/irc/ProtocolProviderFactoryIrcImpl.java
@@ -47,11 +47,6 @@ public class ProtocolProviderFactoryIrcImpl
public static final String SASL_USERNAME = "SASL_USERNAME";
/**
- * Property for SASL password.
- */
- public static final String SASL_PASSWORD = "SASL_PASSWORD";
-
- /**
* Property for SASL authorization role.
*/
public static final String SASL_ROLE = "SASL_ROLE";
diff --git a/src/net/java/sip/communicator/impl/protocol/irc/ProtocolProviderServiceIrcImpl.java b/src/net/java/sip/communicator/impl/protocol/irc/ProtocolProviderServiceIrcImpl.java
index fcc1763..bb4cefa 100644
--- a/src/net/java/sip/communicator/impl/protocol/irc/ProtocolProviderServiceIrcImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/irc/ProtocolProviderServiceIrcImpl.java
@@ -269,9 +269,6 @@ public class ProtocolProviderServiceIrcImpl
ProtocolProviderFactoryIrcImpl.SASL_ENABLED, false);
String saslUser = accountID.getAccountPropertyString(
ProtocolProviderFactoryIrcImpl.SASL_USERNAME);
- // FIXME Retrieve SASL password from Jitsi secure storage!
- String saslPass = accountID.getAccountPropertyString(
- ProtocolProviderFactoryIrcImpl.SASL_PASSWORD);
String saslRole = accountID.getAccountPropertyString(
ProtocolProviderFactoryIrcImpl.SASL_ROLE);
@@ -327,7 +324,8 @@ public class ProtocolProviderServiceIrcImpl
if (saslEnabled)
{
final SASLImpl sasl =
- new ClientConfigImpl.SASLImpl(saslUser, saslPass, saslRole);
+ new ClientConfigImpl.SASLImpl(saslUser, serverPassword,
+ saslRole);
config.setSASL(sasl);
}