Bug 956857 - Fix busted semantics for subject parameter in "xpcom-cat…

…egory-entry-removed" notification. r=bsmedberg
shellylin · Jan 29, 2014 · c779a76 · c779a76
1 parent bb14671
commit c779a76
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/xpcom/components/nsCategoryManager.cpp b/xpcom/components/nsCategoryManager.cpp
@@ -659,7 +659,7 @@ nsCategoryManager::AddCategoryEntry(const char *aCategoryName,
   if (NS_SUCCEEDED(rv)) {
     if (oldEntry) {
       NotifyObservers(NS_XPCOM_CATEGORY_ENTRY_REMOVED_OBSERVER_ID,
-                      aCategoryName, oldEntry);
+                      aCategoryName, aEntryName);
     }
     NotifyObservers(NS_XPCOM_CATEGORY_ENTRY_ADDED_OBSERVER_ID,
                     aCategoryName, aEntryName);

diff --git a/xpcom/tests/unit/test_bug374754.js b/xpcom/tests/unit/test_bug374754.js
@@ -6,6 +6,7 @@ var removedTopic = "xpcom-category-entry-removed";
 var testCategory = "bug-test-category";
 var testEntry = "@mozilla.org/bug-test-entry;1";
 
+var testValue= "check validity";
 var result = "";
 var expected = "add remove add remove ";
 var timer;
@@ -49,8 +50,8 @@ function run_test() {
   observerService.addObserver(observer, removedTopic, false);
 
   var categoryManager = Cc["@mozilla.org/categorymanager;1"].getService(Ci.nsICategoryManager);
-  categoryManager.addCategoryEntry(testCategory, testEntry, testEntry, false, true);
-  categoryManager.addCategoryEntry(testCategory, testEntry, testEntry, false, true);
+  categoryManager.addCategoryEntry(testCategory, testEntry, testValue, false, true);
+  categoryManager.addCategoryEntry(testCategory, testEntry, testValue, false, true);
   categoryManager.deleteCategoryEntry(testCategory, testEntry, false);
 
   timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);