aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip/communicator/plugin/provisioning
diff options
context:
space:
mode:
authorIngo Bauersachs <ingo@jitsi.org>2014-01-13 21:14:23 +0100
committerIngo Bauersachs <ingo@jitsi.org>2014-01-13 21:14:23 +0100
commit6adfcc2a947e155b5719525bf438be90f7e30287 (patch)
treeeb587cc15b69441fe735e620a15f6366b527f16e /src/net/java/sip/communicator/plugin/provisioning
parentad9f04f02d4b0a7d39bd9633c9aa8a9ba0f77497 (diff)
downloadjitsi-6adfcc2a947e155b5719525bf438be90f7e30287.zip
jitsi-6adfcc2a947e155b5719525bf438be90f7e30287.tar.gz
jitsi-6adfcc2a947e155b5719525bf438be90f7e30287.tar.bz2
Move mandatory provisioning property to jitsi-defaults
Diffstat (limited to 'src/net/java/sip/communicator/plugin/provisioning')
-rw-r--r--src/net/java/sip/communicator/plugin/provisioning/ProvisioningServiceImpl.java11
1 files changed, 1 insertions, 10 deletions
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)