diff options
| -rw-r--r-- | lib/jitsi-defaults.properties | 3 | ||||
| -rw-r--r-- | src/net/java/sip/communicator/plugin/provisioning/ProvisioningServiceImpl.java | 11 |
2 files changed, 4 insertions, 10 deletions
diff --git a/lib/jitsi-defaults.properties b/lib/jitsi-defaults.properties index 20a6524..ac2f01f 100644 --- a/lib/jitsi-defaults.properties +++ b/lib/jitsi-defaults.properties @@ -39,6 +39,9 @@ net.java.sip.communicator.plugin.spellcheck.SYSTEM_HUNSPELL_DIR=/usr/share/hunsp # protocol order for the simple initial account registration wizard plugin.simpleaccreg.PROTOCOL_ORDER=SIP|Jabber|Facebook|Google Talk +#provisioning defaults +net.java.sip.communicator.plugin.provisioning.MANDATORY=false + # Bundles marked as "system" in the plugin editor net.java.sip.communicator.plugin.pluginmanager.SYSTEM_BUNDLES=\ net.java.sip.communicator.impl.splashscreen, \ diff --git a/src/net/java/sip/communicator/plugin/provisioning/ProvisioningServiceImpl.java b/src/net/java/sip/communicator/plugin/provisioning/ProvisioningServiceImpl.java index 6bdef32..e2ba67f 100644 --- a/src/net/java/sip/communicator/plugin/provisioning/ProvisioningServiceImpl.java +++ b/src/net/java/sip/communicator/plugin/provisioning/ProvisioningServiceImpl.java @@ -587,17 +587,8 @@ public class ProvisioningServiceImpl { // if canceled, lets check whether provisioning is // mandatory - boolean provisioningMandatory = false; - - String defaultSettingsProp = - ProvisioningActivator.getResourceService() - .getSettingsString(PROPERTY_PROVISIONING_MANDATORY); - if(defaultSettingsProp != null - && Boolean.parseBoolean(defaultSettingsProp)) - provisioningMandatory = true; - if(ProvisioningActivator.getConfigurationService().getBoolean( - PROPERTY_PROVISIONING_MANDATORY, provisioningMandatory)) + PROPERTY_PROVISIONING_MANDATORY, false)) { String errorMsg; if(errorWhileProvisioning != null) |