From 97277e6972e632e398681c3b20065c3537fb9c19 Mon Sep 17 00:00:00 2001 From: Ingo Bauersachs Date: Thu, 5 Dec 2013 19:43:54 +0100 Subject: [PATCH] Move simpleaccreg-PROTOCOL_ORDER to jitsi-defaults --- lib/jitsi-defaults.properties | 5 ++++- resources/config/defaults.properties | 3 --- .../plugin/simpleaccreg/InitialAccountRegistrationFrame.java | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/jitsi-defaults.properties b/lib/jitsi-defaults.properties index 66c8130e0..9990b7b57 100644 --- a/lib/jitsi-defaults.properties +++ b/lib/jitsi-defaults.properties @@ -34,4 +34,7 @@ net.java.sip.communicator.service.protocol.jabber.BYPASS_GTALK_CAPABILITIES=fals net.java.sip.communicator.service.protocol.jabber.GOOGLE_CONTACTS_ENABLED=true #Spellchecker config -net.java.sip.communicator.plugin.spellcheck.SYSTEM_HUNSPELL_DIR=/usr/share/hunspell \ No newline at end of file +net.java.sip.communicator.plugin.spellcheck.SYSTEM_HUNSPELL_DIR=/usr/share/hunspell + +# protocol order for the simple initial account registration wizard +plugin.simpleaccreg.PROTOCOL_ORDER=SIP|Jabber|Facebook|Google Talk|MSN|AIM|ICQ|Yahoo! \ No newline at end of file diff --git a/resources/config/defaults.properties b/resources/config/defaults.properties index 41d83d9e6..f6dfc193d 100644 --- a/resources/config/defaults.properties +++ b/resources/config/defaults.properties @@ -65,9 +65,6 @@ plugin.branding.IS_APPLICATION_NAME_SHOWN=true # jabber accregwizz plugin.jabberaccregwizz.SERVER_COMMENTS=net/java/sip/communicator/plugin/jabberaccregwizz/resources/servercomments.xml -# protocol order for the simple initial account registration wizard -plugin.simpleaccreg.PROTOCOL_ORDER=SIP|Jabber|Facebook|Google Talk|MSN|AIM|ICQ|Yahoo! - # ippi account wizard create accoutns link plugin.ippiaccregwizz.REGISTER_LINK=https://soap.ippi.fr/subscription/jitsi.php?login={0}&password={1}&email={2} diff --git a/src/net/java/sip/communicator/plugin/simpleaccreg/InitialAccountRegistrationFrame.java b/src/net/java/sip/communicator/plugin/simpleaccreg/InitialAccountRegistrationFrame.java index b70615c7b..b11583ed7 100644 --- a/src/net/java/sip/communicator/plugin/simpleaccreg/InitialAccountRegistrationFrame.java +++ b/src/net/java/sip/communicator/plugin/simpleaccreg/InitialAccountRegistrationFrame.java @@ -210,7 +210,8 @@ public void mousePressed(MouseEvent e) private void initAccountWizards() { String simpleWizards - = Resources.getLoginProperty("plugin.simpleaccreg.PROTOCOL_ORDER"); + = SimpleAccountRegistrationActivator.getConfigService() + .getString("plugin.simpleaccreg.PROTOCOL_ORDER"); StringTokenizer tokenizer = new StringTokenizer(simpleWizards, "|");