Fix a bug codec preferences with equal priorities are ignored. Fix some system bundles.

cusax-fix
Damian Minkov 16 years ago
parent 503b1508a2
commit ff7092944c

@ -522,6 +522,13 @@ private int compareEncodingPreferences(MediaFormat enc1, MediaFormat enc2)
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;
}
}

@ -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,

@ -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,

Loading…
Cancel
Save