170006 fix custom update items display in update UI

toolkit/mozapps/extensions/src/nsExtensionManager.js.in

@@ -35,8 +35,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-var gExtensionManager = null;
-
 const nsIExtensionManager       = Components.interfaces.nsIExtensionManager;
 const nsIUpdateService          = Components.interfaces.nsIUpdateService;
 
@@ -63,7 +61,6 @@ const FILE_EXTENSION_MANIFEST = "extension.rdf";
 //
 // Utility Functions
 //
-
 function EM_NS(aProperty)
 {
   return "http://www.mozilla.org/2004/em-rdf#" + aProperty;
@@ -1074,7 +1071,7 @@ nsExtensionItemUpdater.prototype = {
   
   onError: function (aStatus, aMessage)
   {
-    this._os.notifyObservers(aResult, "Update:Extension:Item-Error", aMessage);
+    this._os.notifyObservers(null, "Update:Extension:Item-Error", aMessage);
   },
   
   onDatasourceLoaded: function (aDatasource, aExtension)
@@ -1104,7 +1101,7 @@ nsExtensionItemUpdater.prototype = {
     if (versionChecker.compare(aExtension.version, version) < 0) {
       // Construct an update item and pass it to observers. 
       var item = Components.classes["@mozilla.org/updates/item;1"]
-                            .createInstance(Components.interfaces.nsIUpdateItem);
+                           .createInstance(Components.interfaces.nsIUpdateItem);
       item.init(aExtension.id, version, aExtension.name, -1, updateLink, "", "", 
                 Components.interfaces.TYPE_EXTENSION); // XXXben
       this._os.notifyObservers(item, "Update:Extension:Item-Ended", "");
@@ -1122,13 +1119,17 @@ nsExtensionItemUpdater.prototype = {
   
   getNewestExtensionCallback: function (aResult)
   {
-    var item = aResult;
     try {
-      item.name.toString(); // XXXben This is a lame hack to cause an exception to be
-                            // thrown for null values when there is no newer extension
-                            // or something else bad happens on the server that we 
-                            // don't recognize.
-      this._os.notifyObservers(aResult, "Update:Extension:Item-Ended", "");
+      aResult.name.toString(); // XXXben This is a lame hack to cause an exception to be
+                               // thrown for null values when there is no newer extension
+                               // or something else bad happens on the server that we 
+                               // don't recognize.
+      var item = Components.classes["@mozilla.org/updates/item;1"]
+                           .createInstance(Components.interfaces.nsIUpdateItem);
+      item.init(aResult.id, aResult.version, aResult.name, -1, 
+                aResult.updateURL, aResult.iconURL, "", 
+                aResult.type); 
+      this._os.notifyObservers(item, "Update:Extension:Item-Ended", "");
       ++this._updateCount;
     }
     catch (e) {
@@ -1765,10 +1766,7 @@ var gModule = {
                                 if (aOuter != null)
                                   throw Components.results.NS_ERROR_NO_AGGREGATION;
                                 
-                                if (!gExtensionManager)
-                                  gExtensionManager = new nsExtensionManager();
-                                  
-                                return gExtensionManager.QueryInterface(aIID);
+                                return (new nsExtensionManager()).QueryInterface(aIID);
                               }
                             }
              }

toolkit/mozapps/update/content/update.js

@@ -223,7 +223,8 @@ var gUpdatePage = {
     case "Update:Extension:Item-Started":
       break;
     case "Update:Extension:Item-Ended":
-      gUpdateWizard.itemsToUpdate.push(aSubject);
+      var item = aSubject.QueryInterface(Components.interfaces.nsIUpdateItem);
+      gUpdateWizard.itemsToUpdate.push(item);
       
       ++this._completeCount;
       

toolkit/mozapps/update/src/nsBackgroundUpdateService.js

@@ -58,13 +58,13 @@ const nsIUpdateItem     = Components.interfaces.nsIUpdateItem;
 const UPDATED_EXTENSIONS  = 0x01;
 const UPDATED_APP         = 0x02;
 
-function nsBackgroundUpdateService()
+function nsUpdateService()
 {
   this._pref = Components.classes["@mozilla.org/preferences-service;1"]
                          .getService(Components.interfaces.nsIPrefBranch);
 }
 
-nsBackgroundUpdateService.prototype = {
+nsUpdateService.prototype = {
   _timer: null,
   _pref: null,
   _updateObserver: null,
@@ -290,7 +290,7 @@ nsBackgroundUpdateService.prototype = {
   },
 
   /////////////////////////////////////////////////////////////////////////////
-  // nsBackgroundUpdateService
+  // nsUpdateService
   _makeTimer: function (aDelay)
   {
     if (this._timer) 
@@ -512,9 +512,6 @@ nsVersionChecker.prototype = {
   }
 };
 
-var gUpdateService  = null;
-var gVersionChecker = null;
-
 var gModule = {
   _firstTime: true,
   
@@ -556,10 +553,7 @@ var gModule = {
                             if (aOuter != null)
                               throw Components.results.NS_ERROR_NO_AGGREGATION;
                             
-                            if (!gUpdateService)
-                              gUpdateService = new nsBackgroundUpdateService();
-                              
-                            return gUpdateService.QueryInterface(aIID);
+                            return (new nsUpdateService()).QueryInterface(aIID);
                           }
                         }
              },
@@ -572,10 +566,7 @@ var gModule = {
                             if (aOuter != null)
                               throw Components.results.NS_ERROR_NO_AGGREGATION;
                             
-                            if (!gVersionChecker)
-                              gVersionChecker = new nsVersionChecker();
-                              
-                            return gVersionChecker.QueryInterface(aIID);
+                            return (new nsVersionChecker()).QueryInterface(aIID);
                           }
                         }
              },