Move simpleaccreg-PROTOCOL_ORDER to jitsi-defaults

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
+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!

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}
 

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, "|");