diff options
| author | Ingo Bauersachs <ingo@jitsi.org> | 2011-04-16 11:32:22 +0000 |
|---|---|---|
| committer | Ingo Bauersachs <ingo@jitsi.org> | 2011-04-16 11:32:22 +0000 |
| commit | 9021f66b28ff5e63ebb4c71b4394175f90aeffe0 (patch) | |
| tree | 0044222de5d59d2f14eb32aba7edaa90f8db2ff2 /src/net/java/sip/communicator/plugin/sipaccregwizz | |
| parent | e62228f33cea42b3e3b960f1794a621d51b6bc48 (diff) | |
| download | jitsi-9021f66b28ff5e63ebb4c71b4394175f90aeffe0.zip jitsi-9021f66b28ff5e63ebb4c71b4394175f90aeffe0.tar.gz jitsi-9021f66b28ff5e63ebb4c71b4394175f90aeffe0.tar.bz2 | |
Accept a manually entered proxy in the SIP account reg wizard when the user navigates between the wizards pages.
Remove the unused predefined proxy settings of ippi and sip2sip wizards (they both use autodetection).
Diffstat (limited to 'src/net/java/sip/communicator/plugin/sipaccregwizz')
| -rw-r--r-- | src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationForm.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationForm.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationForm.java index 4c92812..d574af1 100644 --- a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationForm.java +++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationForm.java @@ -234,10 +234,7 @@ public class SIPAccountRegistrationForm registration.setServerAddress(serverAddress); - // set the proxy only if its not already set by some custom - // extending wizard like sip2sip - if(registration.getProxy() == null) - registration.setProxy(proxyAddress); + registration.setProxy(proxyAddress); String displayName = accountPanel.getDisplayName(); registration.setDisplayName(displayName); |