Merge mozilla-central into the "branch" for but 568691. The omnijar XPT/component/chrome registration was removed during this merge, and will be re-added to the component manager shortly.

This commit is contained in:
Benjamin Smedberg
2010-06-21 11:41:42 -04:00
1153 changed files with 116581 additions and 19927 deletions

View File

@@ -316,7 +316,8 @@ CheckVersionFlag(const nsString& aFlag, const nsString& aData,
return false;
if (aResult != eOK) {
PRInt32 c = NS_CompareVersions(aValue.get(), testdata.get());
PRInt32 c = NS_CompareVersions(NS_ConvertUTF16toUTF8(aValue).get(),
NS_ConvertUTF16toUTF8(testdata).get());
if ((c == 0 && comparison & COMPARE_EQ) ||
(c < 0 && comparison & COMPARE_LT) ||
(c > 0 && comparison & COMPARE_GT))