Merge commit 'cf5da99'HEADmaster

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>

1 files changed, 20 insertions, 0 deletions

diff --git a/src/net/java/sip/communicator/impl/resources/ResourceManagementServiceImpl.java b/src/net/java/sip/communicator/impl/resources/ResourceManagementServiceImpl.java
index d116fea..1cc2dcf 100644
--- a/src/net/java/sip/communicator/impl/resources/ResourceManagementServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/resources/ResourceManagementServiceImpl.java
@@ -344,4 +344,24 @@ public class ResourceManagementServiceImpl
     {
         return SkinJarBuilder.createBundleFromZip(zipFile, getImagePack());
     }
+
+    /**
+     * Gets the specified setting from the config service if present, otherwise
+     * from the embedded resources (resources/config/defaults.properties).
+     * 
+     * @param key The setting to lookup.
+     * @return The setting for the key or {@code null} if not found.
+     */
+    @Override
+    public String getSettingsString(String key)
+    {
+        Object configValue = ResourceManagementActivator
+            .getConfigService().getProperty(key);
+        if (configValue == null)
+        {
+            configValue = super.getSettingsString(key);
+        }
+
+        return configValue == null ? null : configValue.toString();
+    }
 }