From 8b495c89e59eae797c1d781b956cee94ade950b8 Mon Sep 17 00:00:00 2001
From: "reed@reedloden.com" <none@none>
Date: Tue, 29 Jan 2008 20:42:33 -0800
Subject: [PATCH] =?UTF-8?q?Bug=20391598=20-=20"make=20upgrade/update=20pro?=
 =?UTF-8?q?cess=20smoother=20and=20avoid=20confusing/modal=20dialogs"=20(r?=
 =?UTF-8?q?ename=20the=20"Later"=20button,=20remove=20the=20modal=20dialog?=
 =?UTF-8?q?)=20[p=3Ddao@mozilla.com=20(D=C3=A3o=20Gottwald)=20r=3Dmconnor?=
 =?UTF-8?q?=20a=3Dblocking-firefox3+]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../en-US/chrome/mozapps/update/updates.properties  |  6 ++----
 toolkit/mozapps/update/content/updates.js           | 13 +++----------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/toolkit/locales/en-US/chrome/mozapps/update/updates.properties b/toolkit/locales/en-US/chrome/mozapps/update/updates.properties
index 8b3dfde6556..e81bcbfa30a 100755
--- a/toolkit/locales/en-US/chrome/mozapps/update/updates.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/update/updates.properties
@@ -45,12 +45,10 @@ downloadButton_minor=Download & Install Now »
 downloadButton_minor.accesskey=D
 downloadButton_major=Get the new version »
 downloadButton_major.accesskey=G
-laterButton=Later
-laterButton.accesskey=a
+notNowButton=Not Now
+notNowButton.accesskey=o
 neverButton=Never
 neverButton.accesskey=N
-restartLaterTitle=Software Update
-restartLaterMsg=The update will be installed the next time %S starts.
 
 resumePausedAfterCloseTitle=Software Update
 resumePausedAfterCloseMessage=You have paused downloading this update. Do you want %S to download the update in the background while you continue to browse?
diff --git a/toolkit/mozapps/update/content/updates.js b/toolkit/mozapps/update/content/updates.js
index 18ee7478781..4743a2d4114 100755
--- a/toolkit/mozapps/update/content/updates.js
+++ b/toolkit/mozapps/update/content/updates.js
@@ -740,7 +740,7 @@ var gUpdatesAvailablePage = {
     gUpdates.setButtons(null, true, "downloadButton_" + severity,
                         false, null, false,
                         null, false, true,
-                        "laterButton", false,
+                        "notNowButton", false,
                         severity == "major" ? "neverButton" : null, false);
     gUpdates.wiz.getButton("next").focus();
   },
@@ -1573,7 +1573,7 @@ var gFinishedPage = {
    */
   onPageShow: function(aDelayRestart) {
     gUpdates.setButtons(null, true, null, true, "restartButton", aDelayRestart,
-                        "laterButton", false, false, null, false, null, false);
+                        "notNowButton", false, false, null, false, null, false);
     if (aDelayRestart)
       setTimeout(this._enableRestartButton, 2000);
     else
@@ -1662,17 +1662,10 @@ var gFinishedPage = {
   },
 
   /**
-   * Called when the wizard is canceled, i.e. when the "Later" button is
+   * Called when the wizard is canceled, i.e. when the "Not Now" button is
    * clicked.
    */
   onWizardCancel: function() {
-    var ps = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
-                       .getService(Components.interfaces.nsIPromptService);
-    var message = gUpdates.strings.getFormattedString("restartLaterMsg",
-      [gUpdates.brandName]);
-    ps.alert(window, gUpdates.strings.getString("restartLaterTitle"),
-             message);
-
     var interval = getPref("getIntPref", PREF_UPDATE_NAGTIMER_RESTART, 86400);
     gUpdates.registerNagTimer("restart-nag-timer", interval,
                               "showUpdateComplete");