aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip/communicator/plugin/jabberaccregwizz
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-03-11 22:15:03 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-03-11 22:15:03 +0100
commit85901329b0794b136b96bf745f4ab1572806fc89 (patch)
treef23da7e97cae727f39d825f0fef8348cffb238e4 /src/net/java/sip/communicator/plugin/jabberaccregwizz
parent3db2e44f186c59429901b2c899e139ea60117a55 (diff)
parentcf5da997da8820b4050f5b87ee9440a0ede36d1f (diff)
downloadjitsi-master.zip
jitsi-master.tar.gz
jitsi-master.tar.bz2
Merge commit 'cf5da99'HEADmaster
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Diffstat (limited to 'src/net/java/sip/communicator/plugin/jabberaccregwizz')
-rw-r--r--src/net/java/sip/communicator/plugin/jabberaccregwizz/AccountPanel.java11
-rw-r--r--src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountCreationForm.java2
2 files changed, 5 insertions, 8 deletions
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/AccountPanel.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/AccountPanel.java
index 0467033..c046348 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/AccountPanel.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/AccountPanel.java
@@ -140,7 +140,7 @@ public class AccountPanel
userIDPassPanel.setBorder(
BorderFactory.createTitledBorder(
Resources.getString(
- "plugin.sipaccregwizz.USERNAME_AND_PASSWORD")));
+ "plugin.jabberaccregwizz.USERNAME_AND_PASSWORD")));
JPanel southPanel = new TransparentPanel(new BorderLayout());
southPanel.add(rememberPassBox, BorderLayout.WEST);
@@ -564,8 +564,7 @@ public class AccountPanel
OperationSetChangePassword.class).supportsPasswordChange())
{
changePasswordMessagePane.setText(Resources.getString(
- "plugin.jabberaccregwizz."
- + "SERVER_NOT_SUPPORT_PASSWORD_CHANGE"));
+ "plugin.jabberaccregwizz.SERVER_NOT_SUPPORT_PASSWORD_CHANGE"));
}
else
{
@@ -683,8 +682,7 @@ public class AccountPanel
getAccountID().getAccountAddress(),
ex);
displayPopupError(Resources.getString(
- "plugin.jabberaccregwizz."
- + "PASSWORD_NOT_STORED"));
+ "plugin.jabberaccregwizz.PASSWORD_NOT_STORED"));
}
}
//now update the password field in AccountPanel,
@@ -705,8 +703,7 @@ public class AccountPanel
}
catch (OperationFailedException ex) {
displayPopupError(Resources.getString(
- "plugin.jabberaccregwizz."
- + "SERVER_NOT_SUPPORT_PASSWORD_CHANGE"));
+ "plugin.jabberaccregwizz.SERVER_NOT_SUPPORT_PASSWORD_CHANGE"));
}
}
}
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountCreationForm.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountCreationForm.java
index 6288821..3e816cf 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountCreationForm.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountCreationForm.java
@@ -93,7 +93,7 @@ public class JabberAccountCreationForm
private JButton chooseButton = new JButton();
// Smack objects
- private XMPPConnection xmppConnection = null;
+ private Connection xmppConnection = null;
private AccountManager accountManager = null;