aboutsummaryrefslogtreecommitdiffstats
path: root/resources/config
diff options
context:
space:
mode:
authorDamian Minkov <damencho@jitsi.org>2008-07-15 13:54:02 +0000
committerDamian Minkov <damencho@jitsi.org>2008-07-15 13:54:02 +0000
commiteb6899b736542b4842b231aa573158abc7fe942a (patch)
tree137b146b4f125f7cd50c52214ef750387a173702 /resources/config
parentb9b01108c33e30acc87e30eb37939086028ad5f5 (diff)
downloadjitsi-eb6899b736542b4842b231aa573158abc7fe942a.zip
jitsi-eb6899b736542b4842b231aa573158abc7fe942a.tar.gz
jitsi-eb6899b736542b4842b231aa573158abc7fe942a.tar.bz2
Remove configuration defaults now if values are missing in configuration service they are get from resource settings , but are always saved through configuration service.
Diffstat (limited to 'resources/config')
-rw-r--r--resources/config/configuration.properties7
-rw-r--r--resources/config/defaults.properties8
2 files changed, 8 insertions, 7 deletions
diff --git a/resources/config/configuration.properties b/resources/config/configuration.properties
deleted file mode 100644
index 2afe62a..0000000
--- a/resources/config/configuration.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-net.java.sip.communicator.impl.msghistory.isMessageHistoryEnabled=true
-net.java.sip.communicator.impl.gui.autoPopupNewMessage=false
-net.java.sip.communicator.impl.gui.sendMessageCommand=Enter
-net.java.sip.communicator.impl.gui.sendTypingNotifications=true
-net.java.sip.communicator.impl.gui.isMultiChatWindowEnabled=true
-net.java.sip.communicator.impl.gui.isMessageHistoryShown=true
-net.java.sip.communicator.impl.gui.messageHistorySize=10
diff --git a/resources/config/defaults.properties b/resources/config/defaults.properties
index 8d21ef4..4c6f364 100644
--- a/resources/config/defaults.properties
+++ b/resources/config/defaults.properties
@@ -1,3 +1,11 @@
+net.java.sip.communicator.impl.msghistory.isMessageHistoryEnabled=true
+net.java.sip.communicator.impl.gui.autoPopupNewMessage=false
+net.java.sip.communicator.impl.gui.sendMessageCommand=Enter
+net.java.sip.communicator.impl.gui.sendTypingNotifications=true
+net.java.sip.communicator.impl.gui.isMultiChatWindowEnabled=true
+net.java.sip.communicator.impl.gui.isMessageHistoryShown=true
+net.java.sip.communicator.impl.gui.messageHistorySize=10
+
applicationName=SIP Communicator
applicationWebSite=http://sip-communicator.org
fontName=Verdana