diff options
| author | Damian Minkov <damencho@jitsi.org> | 2010-06-09 14:50:29 +0000 |
|---|---|---|
| committer | Damian Minkov <damencho@jitsi.org> | 2010-06-09 14:50:29 +0000 |
| commit | ff7092944cb53d35c0918c8301d7e7e013ca683e (patch) | |
| tree | de57e03ab39c75ce9d55832457c8762416dc0d4d | |
| parent | 503b1508a2e2a38601920728e6fd501f41d6e274 (diff) | |
| download | jitsi-ff7092944cb53d35c0918c8301d7e7e013ca683e.zip jitsi-ff7092944cb53d35c0918c8301d7e7e013ca683e.tar.gz jitsi-ff7092944cb53d35c0918c8301d7e7e013ca683e.tar.bz2 | |
Fix a bug codec preferences with equal priorities are ignored. Fix some system bundles.
4 files changed, 10 insertions, 1 deletions
diff --git a/lib/bundle/org.apache.felix.bundlerepository-1.4.2.jar b/lib/bundle/org.apache.felix.bundlerepository-1.4.2.jar Binary files differindex ab4aed3..a4e12e5 100644 --- a/lib/bundle/org.apache.felix.bundlerepository-1.4.2.jar +++ b/lib/bundle/org.apache.felix.bundlerepository-1.4.2.jar diff --git a/src/net/java/sip/communicator/impl/neomedia/codec/EncodingConfiguration.java b/src/net/java/sip/communicator/impl/neomedia/codec/EncodingConfiguration.java index c25a716..9a77026 100644 --- a/src/net/java/sip/communicator/impl/neomedia/codec/EncodingConfiguration.java +++ b/src/net/java/sip/communicator/impl/neomedia/codec/EncodingConfiguration.java @@ -522,6 +522,13 @@ public class EncodingConfiguration Integer pref2 = encodingPreferences.get(enc2); int pref2IntValue = (pref2 == null) ? 0 : pref2; - return pref2IntValue - pref1IntValue; + int res = pref2IntValue - pref1IntValue; + + // if the encodings are with same priority + // compare them by name, if we return equals TreeSet wont add + // equal encodings + if(res == 0) + return enc1.getEncoding().compareTo(enc2.getEncoding()); + return res; } } diff --git a/src/net/java/sip/communicator/plugin/facebookaccregwizz/facebookaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/facebookaccregwizz/facebookaccregwizz.manifest.mf index 708c05e..a5dcd30 100644 --- a/src/net/java/sip/communicator/plugin/facebookaccregwizz/facebookaccregwizz.manifest.mf +++ b/src/net/java/sip/communicator/plugin/facebookaccregwizz/facebookaccregwizz.manifest.mf @@ -3,6 +3,7 @@ Bundle-Name: Facebook account registration wizard Bundle-Description: Facebook account registration wizard.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
+System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.service.browserlauncher,
net.java.sip.communicator.service.configuration,
diff --git a/src/net/java/sip/communicator/plugin/globalproxyconfig/globalproxyconfig.manifest.mf b/src/net/java/sip/communicator/plugin/globalproxyconfig/globalproxyconfig.manifest.mf index 0fc6afd..5ea6364 100644 --- a/src/net/java/sip/communicator/plugin/globalproxyconfig/globalproxyconfig.manifest.mf +++ b/src/net/java/sip/communicator/plugin/globalproxyconfig/globalproxyconfig.manifest.mf @@ -3,6 +3,7 @@ Bundle-Name: Global Proxy Config Plugin Bundle-Description: A plugin to configure global proxy for sip communicator
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
+System-Bundle: yes
Import-Package: org.osgi.framework,
net.java.sip.communicator.util,
net.java.sip.communicator.util.swing,
|