b=426175, r=gavin, blocking=beltzner. FUEL Application.extensions fail

This commit is contained in:
mark.finkle@gmail.com 2008-04-02 20:32:42 -07:00
parent a8660a0b46
commit aea7a22bba

View File

@ -690,10 +690,10 @@ Application.prototype = {
_xpcom_factory: ApplicationFactory,
// for nsISupports
QueryInterface : XPCOMUtils.generateQI([Ci.fuelIApplication, Ci.nsIObserver, Ci.nsIClassInfo]),
QueryInterface : XPCOMUtils.generateQI([Ci.fuelIApplication, Ci.extIApplication, Ci.nsIObserver, Ci.nsIClassInfo]),
getInterfaces : function app_gi(aCount) {
var interfaces = [Ci.fuelIApplication, Ci.nsIObserver, Ci.nsIClassInfo];
var interfaces = [Ci.fuelIApplication, Ci.extIApplication, Ci.nsIObserver, Ci.nsIClassInfo];
aCount.value = interfaces.length;
return interfaces;
},
@ -701,7 +701,7 @@ Application.prototype = {
// for nsIObserver
observe: function app_observe(aSubject, aTopic, aData) {
// Call the extApplication version of this function first
this.__proto__.__proto__.observe(aSubject, aTopic, aData);
this.__proto__.__proto__.observe.call(this, aSubject, aTopic, aData);
if (aTopic == "xpcom-shutdown") {
this._bookmarks = null;
Utilities.free();