Move mandatory provisioning property to jitsi-defaults

cusax-fix
Ingo Bauersachs 12 years ago
parent ad9f04f02d
commit 6adfcc2a94

@ -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, \

@ -587,17 +587,8 @@ public boolean hasParams(String location)
{
// 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)

Loading…
Cancel
Save