aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDamian Minkov <damencho@jitsi.org>2010-03-19 09:46:36 +0000
committerDamian Minkov <damencho@jitsi.org>2010-03-19 09:46:36 +0000
commite23016482bc4e43ecb7316f67f88bffa5a78181b (patch)
treecc0b6ac816414bb89cf05583d04bd7e2b042753d /lib
parent8b6fe03dab4afc4912f2bbcee538833e6023eae5 (diff)
downloadjitsi-e23016482bc4e43ecb7316f67f88bffa5a78181b.zip
jitsi-e23016482bc4e43ecb7316f67f88bffa5a78181b.tar.gz
jitsi-e23016482bc4e43ecb7316f67f88bffa5a78181b.tar.bz2
Fix proxy configuration form. Fix icq use of proxy settings. Move the plug-in before loading protocols. Remove save button from configuration form. Add chart for supported protocol-proxy settings.
Make all jabber contacts offline if protocol is firing protocol provider change event to offline.
Diffstat (limited to 'lib')
-rw-r--r--lib/felix.client.run.properties6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/felix.client.run.properties b/lib/felix.client.run.properties
index 0c94c8f..f5bda71 100644
--- a/lib/felix.client.run.properties
+++ b/lib/felix.client.run.properties
@@ -54,7 +54,8 @@ felix.auto.start.49= \
reference:file:sc-bundles/bouncycastle.jar \
reference:file:sc-bundles/zrtp4j.jar \
reference:file:sc-bundles/protocol.jar \
- reference:file:lib/bundle/httpcore.jar
+ reference:file:lib/bundle/httpcore.jar \
+ reference:file:sc-bundles/globalproxyconfig.jar
#the contact list service depends on protocol.jar
#some protocol implementations however depend on the contact list
@@ -128,8 +129,7 @@ felix.auto.start.67= \
reference:file:sc-bundles/generalconfig.jar \
reference:file:sc-bundles/dictaccregwizz.jar \
reference:file:sc-bundles/otr.jar \
- reference:file:sc-bundles/facebookaccregwizz.jar \
- reference:file:sc-bundles/globalproxyconfig.jar
+ reference:file:sc-bundles/facebookaccregwizz.jar
#level 68 is for profiler, don't use it or change the build.xml file accordingly