Bug 458839 - Move errors.xul from update over to extensions since the add-ons mgr. is the only consumer. r=dtownsend
authorRobert Strong <robert.bugzilla@gmail.com>
Fri, 10 Oct 2008 15:36:46 -0700
changeset 20283 a6a684a3c0c989ddfde5218b9826b21fdb7cdbf7
parent 20282 13098edfa017f100d08e87a7b5e116b74720a35c
child 20284 14db21f85e282a63f2b1cb70fdd9d8df324515a0
push id2770
push userrstrong@mozilla.com
push dateFri, 10 Oct 2008 22:37:42 +0000
treeherdermozilla-central@a6a684a3c0c9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdtownsend
bugs458839
milestone1.9.1b2pre
Bug 458839 - Move errors.xul from update over to extensions since the add-ons mgr. is the only consumer. r=dtownsend
toolkit/locales/en-US/chrome/mozapps/extensions/errors.dtd
toolkit/locales/en-US/chrome/mozapps/update/errors.dtd
toolkit/locales/jar.mn
toolkit/mozapps/extensions/content/errors.xul
toolkit/mozapps/extensions/content/update.js
toolkit/mozapps/extensions/jar.mn
toolkit/mozapps/update/content/errors.xul
toolkit/mozapps/update/jar.mn
new file mode 100644
--- /dev/null
+++ b/toolkit/locales/en-US/chrome/mozapps/extensions/errors.dtd
@@ -0,0 +1,1 @@
+<!ENTITY  errors.title                "Errors">
deleted file mode 100644
--- a/toolkit/locales/en-US/chrome/mozapps/update/errors.dtd
+++ /dev/null
@@ -1,1 +0,0 @@
-<!ENTITY  errors.title                "Errors">
--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -73,16 +73,17 @@
 * locale/@AB_CD@/mozapps/downloads/unknownContentType.properties  (%chrome/mozapps/downloads/unknownContentType.properties)
 * locale/@AB_CD@/mozapps/downloads/unknownContentType.dtd         (%chrome/mozapps/downloads/unknownContentType.dtd)
 * locale/@AB_CD@/mozapps/downloads/settingsChange.dtd             (%chrome/mozapps/downloads/settingsChange.dtd)
   locale/@AB_CD@/mozapps/downloads/downloads.dtd                  (%chrome/mozapps/downloads/downloads.dtd)
   locale/@AB_CD@/mozapps/downloads/downloads.properties           (%chrome/mozapps/downloads/downloads.properties)
   locale/@AB_CD@/mozapps/extensions/extensions.dtd                (%chrome/mozapps/extensions/extensions.dtd)
   locale/@AB_CD@/mozapps/extensions/extensions.properties         (%chrome/mozapps/extensions/extensions.properties)
   locale/@AB_CD@/mozapps/extensions/about.dtd                     (%chrome/mozapps/extensions/about.dtd)
+  locale/@AB_CD@/mozapps/extensions/errors.dtd                    (%chrome/mozapps/extensions/errors.dtd)
   locale/@AB_CD@/mozapps/extensions/update.dtd                    (%chrome/mozapps/extensions/update.dtd)
   locale/@AB_CD@/mozapps/extensions/update.properties             (%chrome/mozapps/extensions/update.properties)
   locale/@AB_CD@/mozapps/handling/handling.dtd                    (%chrome/mozapps/handling/handling.dtd)
   locale/@AB_CD@/mozapps/handling/handling.properties             (%chrome/mozapps/handling/handling.properties)
   locale/@AB_CD@/mozapps/plugins/plugins.dtd                      (%chrome/mozapps/plugins/plugins.dtd)
   locale/@AB_CD@/mozapps/plugins/plugins.properties               (%chrome/mozapps/plugins/plugins.properties)
   locale/@AB_CD@/mozapps/preferences/ocsp.dtd                     (%chrome/mozapps/preferences/ocsp.dtd)
   locale/@AB_CD@/mozapps/preferences/changemp.dtd                 (%chrome/mozapps/preferences/changemp.dtd)
@@ -90,17 +91,16 @@
   locale/@AB_CD@/mozapps/preferences/preferences.properties       (%chrome/mozapps/preferences/preferences.properties)
   locale/@AB_CD@/mozapps/profile/createProfileWizard.dtd          (%chrome/mozapps/profile/createProfileWizard.dtd)
   locale/@AB_CD@/mozapps/profile/profileSelection.properties      (%chrome/mozapps/profile/profileSelection.properties)
   locale/@AB_CD@/mozapps/profile/profileSelection.dtd             (%chrome/mozapps/profile/profileSelection.dtd)
   locale/@AB_CD@/mozapps/update/updates.dtd                       (%chrome/mozapps/update/updates.dtd)
   locale/@AB_CD@/mozapps/update/updates.properties                (%chrome/mozapps/update/updates.properties)
   locale/@AB_CD@/mozapps/update/incompatible.dtd                  (%chrome/mozapps/update/incompatible.dtd)
   locale/@AB_CD@/mozapps/update/history.dtd                       (%chrome/mozapps/update/history.dtd)
-  locale/@AB_CD@/mozapps/update/errors.dtd                        (%chrome/mozapps/update/errors.dtd)
   locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.dtd           (%chrome/mozapps/xpinstall/xpinstallConfirm.dtd)
   locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.properties    (%chrome/mozapps/xpinstall/xpinstallConfirm.properties)
 % locale alerts @AB_CD@ %locale/@AB_CD@/alerts/
   locale/@AB_CD@/alerts/notificationNames.properties             (%chrome/alerts/notificationNames.properties)
 % locale cookie @AB_CD@ %locale/@AB_CD@/cookie/
   locale/@AB_CD@/cookie/cookieAcceptDialog.dtd           (%chrome/cookie/cookieAcceptDialog.dtd)
   locale/@AB_CD@/cookie/cookieAcceptDialog.properties    (%chrome/cookie/cookieAcceptDialog.properties)
 % locale passwordmgr @AB_CD@ %locale/@AB_CD@/passwordmgr/
new file mode 100644
--- /dev/null
+++ b/toolkit/mozapps/extensions/content/errors.xul
@@ -0,0 +1,112 @@
+<?xml version="1.0"?>
+
+# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is The Extension Manager.
+#
+# The Initial Developer of the Original Code is
+# Ben Goodger.
+# Portions created by the Initial Developer are Copyright (C) 2004
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Ben Goodger <ben@bengoodger.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
+
+<!DOCTYPE dialog SYSTEM "chrome://mozapps/locale/extensions/errors.dtd">
+
+<dialog id="errors"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="&errors.title;"
+        onload="init()"
+        style="width: 40em;"
+        buttons="cancel">
+
+  <script type="application/javascript">
+  <![CDATA[
+    function LOG(string) 
+    {
+      dump("*** " + string + "\n");
+      var console = Components.classes["@mozilla.org/consoleservice;1"]
+                              .getService(Components.interfaces.nsIConsoleService);  
+      console.logStringMessage(string);
+    }
+
+    function init()
+    {
+      var state = window.arguments[0].state;
+      var brandShortName = document.getElementById("brandStrings").getString("brandShortName");
+      var updateStrings = document.getElementById("updateStrings");
+      var str = updateStrings.getFormattedString(state + "Errors", [brandShortName]);
+      document.getElementById("intro").appendChild(document.createTextNode(str));
+      
+      var xpinstallStrings = document.getElementById("xpinstallStrings");
+      
+      var items = window.arguments[0].errors;
+      var listbox = document.getElementById("extensions");
+      for (var i = 0; i < items.length; ++i) {
+        if (items[i].error) {
+          if (items[i].error == -207) {
+            LOG("Error -207 (\"Not a valid install package\") generally implies\r\n" + 
+                "a 404 at the URL specified for the update. Check for typos in\r\n" + 
+                "your update manifest.");
+          }
+          var listitem = document.createElement("listitem");
+          try {
+            var errorString = xpinstallStrings.getString("error" + items[i].error);
+            var label = updateStrings.getFormattedString("installErrorItemFormat", 
+                                                         [items[i].name, errorString]);
+          }
+          catch (e) { label = items[i].name; }
+          listitem.setAttribute("label", label);
+          listbox.appendChild(listitem);
+        }
+      }
+      var strings = document.getElementById("updateStrings");
+      var cancel = document.documentElement.getButton("cancel");
+      cancel.label = strings.getString("closeButton");
+      cancel.focus();
+    }
+  ]]>
+  </script>
+  
+  <stringbundleset id="updateSet">
+    <stringbundle id="brandStrings" src="chrome://branding/locale/brand.properties"/>
+    <stringbundle id="xpinstallStrings" src="chrome://global/locale/xpinstall/xpinstall.properties"/>
+    <stringbundle id="updateStrings" src="chrome://mozapps/locale/extensions/update.properties"/>
+  </stringbundleset>
+
+  <description id="intro"/>
+  <separator class="thin"/>
+  <listbox id="extensions" rows="7"/>
+  <separator class="thin"/>
+
+</dialog>
+
--- a/toolkit/mozapps/extensions/content/update.js
+++ b/toolkit/mozapps/extensions/content/update.js
@@ -122,17 +122,17 @@ var gUpdateWizard = {
     this._setUpButton("cancel", aCancelButton, aCancelButtonIsDisabled);
   },
 
   /////////////////////////////////////////////////////////////////////////////
   // Update Errors
   errorItems: [],
   showErrors: function (aState, aErrors)
   {
-    openDialog("chrome://mozapps/content/update/errors.xul", "",
+    openDialog("chrome://mozapps/content/extensions/errors.xul", "",
                "modal", { state: aState, errors: aErrors });
   },
 
   // Displays a list of items that had an error during the update check. We
   // don't display the actual error that occured since
   // nsIAddonUpdateCheckListener doesn't return the error details.
   showUpdateCheckErrors: function ()
   {
--- a/toolkit/mozapps/extensions/jar.mn
+++ b/toolkit/mozapps/extensions/jar.mn
@@ -4,12 +4,13 @@ toolkit.jar:
 * content/mozapps/extensions/extensions.js                      (content/extensions.js)
 * content/mozapps/extensions/extensions.xml                     (content/extensions.xml)
   content/mozapps/extensions/updateinfo.xsl                     (content/updateinfo.xsl)
   content/mozapps/extensions/extensions.css                     (content/extensions.css)
 * content/mozapps/extensions/about.xul                          (content/about.xul)
 * content/mozapps/extensions/about.js                           (content/about.js)
 * content/mozapps/extensions/list.xul                           (content/list.xul)
 * content/mozapps/extensions/list.js                            (content/list.js)
+* content/mozapps/extensions/errors.xul                         (content/errors.xul)
 * content/mozapps/extensions/update.xul                         (content/update.xul)
 * content/mozapps/extensions/update.js                          (content/update.js)
 * content/mozapps/extensions/eula.xul                           (content/eula.xul)
 * content/mozapps/extensions/eula.js                            (content/eula.js)
deleted file mode 100644
--- a/toolkit/mozapps/update/content/errors.xul
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0"?>
-
-# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is The Update Service.
-#
-# The Initial Developer of the Original Code is
-# Ben Goodger.
-# Portions created by the Initial Developer are Copyright (C) 2004
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Ben Goodger <ben@bengoodger.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
-
-<!DOCTYPE dialog SYSTEM "chrome://mozapps/locale/update/errors.dtd">
-
-<dialog id="errors"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="&errors.title;"
-        onload="init()"
-        style="width: 40em;"
-        buttons="cancel">
-
-  <script type="application/javascript">
-  <![CDATA[
-    function LOG(string) 
-    {
-      dump("*** " + string + "\n");
-      var console = Components.classes["@mozilla.org/consoleservice;1"]
-                              .getService(Components.interfaces.nsIConsoleService);  
-      console.logStringMessage(string);
-    }
-
-    function init()
-    {
-      var state = window.arguments[0].state;
-      var brandShortName = document.getElementById("brandStrings").getString("brandShortName");
-      var updateStrings = document.getElementById("updateStrings");
-      var str = updateStrings.getFormattedString(state + "Errors", [brandShortName]);
-      document.getElementById("intro").appendChild(document.createTextNode(str));
-      
-      var xpinstallStrings = document.getElementById("xpinstallStrings");
-      
-      var items = window.arguments[0].errors;
-      var listbox = document.getElementById("extensions");
-      for (var i = 0; i < items.length; ++i) {
-        if (items[i].error) {
-          if (items[i].error == -207) {
-            LOG("Error -207 (\"Not a valid install package\") generally implies\r\n" + 
-                "a 404 at the URL specified for the update. Check for typos in\r\n" + 
-                "your update manifest.");
-          }
-          var listitem = document.createElement("listitem");
-          try {
-            var errorString = xpinstallStrings.getString("error" + items[i].error);
-            var label = updateStrings.getFormattedString("installErrorItemFormat", 
-                                                         [items[i].name, errorString]);
-          }
-          catch (e) { label = items[i].name; }
-          listitem.setAttribute("label", label);
-          listbox.appendChild(listitem);
-        }
-      }
-      var strings = document.getElementById("updateStrings");
-      var cancel = document.documentElement.getButton("cancel");
-      cancel.label = strings.getString("closeButton");
-      cancel.focus();
-    }
-  ]]>
-  </script>
-  
-  <stringbundleset id="updateSet">
-    <stringbundle id="brandStrings" src="chrome://branding/locale/brand.properties"/>
-    <stringbundle id="xpinstallStrings" src="chrome://global/locale/xpinstall/xpinstall.properties"/>
-    <stringbundle id="updateStrings" src="chrome://mozapps/locale/extensions/update.properties"/>
-  </stringbundleset>
-
-  <description id="intro"/>
-  <separator class="thin"/>
-  <listbox id="extensions" rows="7"/>
-  <separator class="thin"/>
-
-</dialog>
-
--- a/toolkit/mozapps/update/jar.mn
+++ b/toolkit/mozapps/update/jar.mn
@@ -3,9 +3,8 @@ toolkit.jar:
   content/mozapps/update/updates.css                            (content/updates.css)
 * content/mozapps/update/updates.xul                            (content/updates.xul)
 * content/mozapps/update/updates.js                             (content/updates.js)
 * content/mozapps/update/updates.xml                            (content/updates.xml)
 * content/mozapps/update/incompatible.xul                       (content/incompatible.xul)
 * content/mozapps/update/incompatible.js                        (content/incompatible.js)
 * content/mozapps/update/history.xul                            (content/history.xul)
 * content/mozapps/update/history.js                             (content/history.js)
-* content/mozapps/update/errors.xul                             (content/errors.xul)