Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 342587 - Extension update can be displayed on app upgrade. patch=michael.wu, r=rob_strong

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@201069 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rob_strong%exchangecode.com 2006-06-28 05:01:10 +00:00
parent a8d8cc7ff5
commit 01f83d60eb
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mozilla/toolkit/mozapps/extensions/content/extensions.js
View File

@ -1398,7 +1398,10 @@ function installUpdatesAll() {
function restartApp() {
const nsIAppStartup = Components.interfaces.nsIAppStartup;
if (canQuitApplication())
if (gUpdatesOnly)
window.close();
else if (canQuitApplication())
Components.classes["@mozilla.org/toolkit/app-startup;1"].getService(nsIAppStartup)
.quit(nsIAppStartup.eRestart | nsIAppStartup.eAttemptQuit);
}

3
mozilla/toolkit/mozapps/extensions/src/nsExtensionManager.js.in
View File

@ -2709,7 +2709,6 @@ ExtensionManager.prototype = {
break;
case "profile-after-change":
this._profileSelected();
this._showUpdatesWindow();
break;
case "quit-application-requested":
this._confirmCancelDownloadsOnQuit(subject);
@ -2857,6 +2856,8 @@ ExtensionManager.prototype = {
var isDirty = false;
var forceAutoReg = false;
this._showUpdatesWindow();
// Somehow the component list went away, and for that reason the new one
// generated by this function is going to result in a different compreg.
// We must force a restart.