aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip/communicator/plugin/sipaccregwizz
diff options
context:
space:
mode:
authorDamian Minkov <damencho@jitsi.org>2011-07-04 15:51:08 +0000
committerDamian Minkov <damencho@jitsi.org>2011-07-04 15:51:08 +0000
commit9f22e4f1f08ce31bdafdc7a51f47417f7caf0c9f (patch)
treedadf998f5b62951d5260c65b12282c4d6668c276 /src/net/java/sip/communicator/plugin/sipaccregwizz
parent2e78f26000b30f35d464e5c21f842c67e1f54691 (diff)
downloadjitsi-9f22e4f1f08ce31bdafdc7a51f47417f7caf0c9f.zip
jitsi-9f22e4f1f08ce31bdafdc7a51f47417f7caf0c9f.tar.gz
jitsi-9f22e4f1f08ce31bdafdc7a51f47417f7caf0c9f.tar.bz2
Fixes displaying and deleting voicemail URI when editing sip account.
Diffstat (limited to 'src/net/java/sip/communicator/plugin/sipaccregwizz')
-rw-r--r--src/net/java/sip/communicator/plugin/sipaccregwizz/ConnectionPanel.java9
-rw-r--r--src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationForm.java6
-rw-r--r--src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java2
3 files changed, 17 insertions, 0 deletions
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/ConnectionPanel.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/ConnectionPanel.java
index a48d9b2..398781a 100644
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/ConnectionPanel.java
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/ConnectionPanel.java
@@ -518,6 +518,15 @@ public class ConnectionPanel
}
/**
+ * Sets the voicemail URI.
+ * @param voicemailURI the voicemail URI.
+ */
+ void setVoicemailURI(String voicemailURI)
+ {
+ voicemailField.setText(voicemailURI);
+ }
+
+ /**
* Sets the keep alive interval
* @param keepAliveInterval the keep alive interval
*/
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationForm.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationForm.java
index 534eda7..53d64ce 100644
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationForm.java
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationForm.java
@@ -360,6 +360,9 @@ public class SIPAccountRegistrationForm
String keepAliveInterval =
accountID.getAccountPropertyString("KEEP_ALIVE_INTERVAL");
+ String voicemailURI = accountID.getAccountPropertyString(
+ ProtocolProviderFactory.VOICEMAIL_URI);
+
boolean xCapEnable = accountID
.getAccountPropertyBoolean("XCAP_ENABLE", false);
boolean xCapUseSipCredetials = accountID
@@ -428,6 +431,9 @@ public class SIPAccountRegistrationForm
connectionPanel.setKeepAliveMethod(keepAliveMethod);
connectionPanel.setKeepAliveInterval(keepAliveInterval);
+ if (voicemailURI != null && voicemailURI.length() > 0)
+ connectionPanel.setVoicemailURI(voicemailURI);
+
presencePanel.setXCapEnable(xCapEnable);
presencePanel.setXCapEnableEnabled(xCapEnable);
presencePanel.setXCapUseSipCredetials(xCapUseSipCredetials);
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java
index 6e830d0..4492541 100644
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java
@@ -511,6 +511,8 @@ public class SIPAccountRegistrationWizard
accountProperties.put(
ProtocolProviderFactory.VOICEMAIL_URI,
registration.getVoicemailURI());
+ else if(isModification())
+ accountProperties.put(ProtocolProviderFactory.VOICEMAIL_URI, "");
if(isModification())
{