aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip/communicator/plugin
diff options
context:
space:
mode:
authorDamian Minkov <damencho@jitsi.org>2010-09-30 10:01:15 +0000
committerDamian Minkov <damencho@jitsi.org>2010-09-30 10:01:15 +0000
commitbffb04fdab857685e9892f1b5a373e1761d72eb9 (patch)
tree29190c0e871b79775165b97362f4c96fd6b4f597 /src/net/java/sip/communicator/plugin
parent14cc43f5c9a2c026fb34182d2725435d400aa763 (diff)
downloadjitsi-bffb04fdab857685e9892f1b5a373e1761d72eb9.zip
jitsi-bffb04fdab857685e9892f1b5a373e1761d72eb9.tar.gz
jitsi-bffb04fdab857685e9892f1b5a373e1761d72eb9.tar.bz2
Set default sip registration time to 600.
Enable by default xcap server when adding existing sip2sip accounts. Enable setting sip account avatar through xcap.
Diffstat (limited to 'src/net/java/sip/communicator/plugin')
-rw-r--r--src/net/java/sip/communicator/plugin/sip2sipaccregwizz/Sip2SipAccountRegistrationWizard.java4
-rw-r--r--src/net/java/sip/communicator/plugin/sipaccregwizz/PresencePanel.java4
2 files changed, 8 insertions, 0 deletions
diff --git a/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/Sip2SipAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/Sip2SipAccountRegistrationWizard.java
index fa2c046..47d1581 100644
--- a/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/Sip2SipAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/Sip2SipAccountRegistrationWizard.java
@@ -54,6 +54,10 @@ public class Sip2SipAccountRegistrationWizard
getRegistration().setKeepAliveMethod("NONE");
getRegistration().setDefaultKeepAliveMethod("NONE");
getRegistration().setDefaultDomain("sip2sip.info");
+ getRegistration().setXCapEnable(true);
+ getRegistration().setXCapServerUri(
+ "https://xcap.sipthor.net/xcap-root@sip2sip.info");
+ getRegistration().setXCapUseSipCredetials(true);
}
/**
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/PresencePanel.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/PresencePanel.java
index 1959797..e561408 100644
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/PresencePanel.java
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/PresencePanel.java
@@ -102,6 +102,10 @@ public class PresencePanel
Resources.getString("plugin.sipaccregwizz.XCAP_USE_SIP_CREDENTIALS"),
regform.getRegistration().isXCapUseSipCredetials());
+ if(regform.getRegistration().isXCapEnable())
+ this.xCapServerUriValue.setText(
+ regform.getRegistration().getXCapServerUri());
+
enablePresOpButton.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent evt)