diff --git a/mozilla/extensions/pref/autoconfig/src/nsReadConfig.cpp b/mozilla/extensions/pref/autoconfig/src/nsReadConfig.cpp
index c2d42004fd4..f12c7b2caa7 100644
--- a/mozilla/extensions/pref/autoconfig/src/nsReadConfig.cpp
+++ b/mozilla/extensions/pref/autoconfig/src/nsReadConfig.cpp
@@ -138,7 +138,7 @@ NS_IMETHODIMP nsReadConfig::Observe(nsISupports *aSubject, const char *aTopic, c
             nsCOMPtr<nsIAppShellService> appShellService =
                 do_GetService("@mozilla.org/appshell/appShellService;1");
             if (appShellService)
-                appShellService->Quit();
+                appShellService->Quit(nsIAppShellService::eAttemptQuit);
         }
     }
     return rv;
diff --git a/mozilla/xpfe/appshell/src/nsCommandLineServiceMac.cpp b/mozilla/xpfe/appshell/src/nsCommandLineServiceMac.cpp
index d084dc4e6c1..7dee157b30e 100644
--- a/mozilla/xpfe/appshell/src/nsCommandLineServiceMac.cpp
+++ b/mozilla/xpfe/appshell/src/nsCommandLineServiceMac.cpp
@@ -376,7 +376,7 @@ OSErr nsMacCommandLine::Quit(TAskSave askSave)
 	if (NS_FAILED(rv))
 		return errAEEventNotHandled;
 	
-	(void)appShellService->Quit();
+	(void)appShellService->Quit(nsIAppShellService::eAttemptQuit);
 	return noErr;
 }
 
diff --git a/mozilla/xpfe/bootstrap/nsSigHandlers.cpp b/mozilla/xpfe/bootstrap/nsSigHandlers.cpp
index e4d0003cc50..64813b559b6 100644
--- a/mozilla/xpfe/bootstrap/nsSigHandlers.cpp
+++ b/mozilla/xpfe/bootstrap/nsSigHandlers.cpp
@@ -163,7 +163,7 @@ void beos_signal_handler(int signum) {
 	}
 
 	// Exit the appshell so that the app can shutdown normally
-	appShellService->Quit();
+	appShellService->Quit(nsIAppShellService::eAttemptQuit);
 }
 #endif 
 
diff --git a/mozilla/xpfe/browser/src/nsBrowserInstance.cpp b/mozilla/xpfe/browser/src/nsBrowserInstance.cpp
index 3097b88e452..16bfe320985 100644
--- a/mozilla/xpfe/browser/src/nsBrowserInstance.cpp
+++ b/mozilla/xpfe/browser/src/nsBrowserInstance.cpp
@@ -234,7 +234,7 @@ public:
                                                 appShellServ, PROXY_ASYNC | PROXY_ALWAYS,
                                                 getter_AddRefs(appShellProxy));
 
-      (void)appShellProxy->Quit();
+      (void)appShellProxy->Quit(nsIAppShellService::eAttemptQuit);
       return NS_ERROR_FAILURE;
     }
   }
diff --git a/mozilla/xpfe/components/killAll/nsKillAll.js b/mozilla/xpfe/components/killAll/nsKillAll.js
index a1b052d47ec..9d52fab4cf6 100644
--- a/mozilla/xpfe/components/killAll/nsKillAll.js
+++ b/mozilla/xpfe/components/killAll/nsKillAll.js
@@ -119,7 +119,7 @@ nsKillAll.prototype = {
 
       if (wasMozillaAlreadyRunning) {
         // Need to exit appshell in this case.
-        appShellService.quit();
+        appShellService.quit(Components.interfaces.nsIAppShellService.eAttemptQuit);
       }
 
       // We throw NS_ERROR_NOT_AVAILABLE which will be interpreted by the caller
diff --git a/mozilla/xpfe/components/startup/src/nsCommandLineServiceMac.cpp b/mozilla/xpfe/components/startup/src/nsCommandLineServiceMac.cpp
index d084dc4e6c1..7dee157b30e 100644
--- a/mozilla/xpfe/components/startup/src/nsCommandLineServiceMac.cpp
+++ b/mozilla/xpfe/components/startup/src/nsCommandLineServiceMac.cpp
@@ -376,7 +376,7 @@ OSErr nsMacCommandLine::Quit(TAskSave askSave)
 	if (NS_FAILED(rv))
 		return errAEEventNotHandled;
 	
-	(void)appShellService->Quit();
+	(void)appShellService->Quit(nsIAppShellService::eAttemptQuit);
 	return noErr;
 }
 
diff --git a/mozilla/xpfe/global/resources/content/globalOverlay.js b/mozilla/xpfe/global/resources/content/globalOverlay.js
index 6337526764d..992d7783463 100644
--- a/mozilla/xpfe/global/resources/content/globalOverlay.js
+++ b/mozilla/xpfe/global/resources/content/globalOverlay.js
@@ -35,7 +35,7 @@ function goQuitApplication()
      domWindow.close();
   };
   if (!nativeAppSupport || !nativeAppSupport.isServerMode)
-    appShell.quit();
+    appShell.quit(Components.interfaces.nsIAppShellService.eAttemptQuit);
   return true;
 }