From dfa83d8d8308d77615a4f7ec27bbbd0cced66eee Mon Sep 17 00:00:00 2001
From: "bsmedberg%covad.net"
 <bsmedberg%covad.net@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 20 May 2005 16:42:15 +0000
Subject: [PATCH] Move xmlprettyprint stylesheets to "global" package, noticed
 this during bug 281988, r+sr=bzbarsky a=drivers

git-svn-id: svn://10.0.0.236/trunk@173632 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../content/xml/document/resources/XMLMonoPrint.css    |  2 +-
 .../content/xml/document/resources/XMLPrettyPrint.xsl  |  4 ++--
 mozilla/content/xml/document/resources/jar.mn          | 10 +++++-----
 .../content/xml/document/src/nsXMLPrettyPrinter.cpp    |  8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/mozilla/content/xml/document/resources/XMLMonoPrint.css b/mozilla/content/xml/document/resources/XMLMonoPrint.css
index f7ab7262176..b77748b4738 100755
--- a/mozilla/content/xml/document/resources/XMLMonoPrint.css
+++ b/mozilla/content/xml/document/resources/XMLMonoPrint.css
@@ -36,7 +36,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-@import url("chrome://communicator/content/xml/XMLPrettyPrint.css");
+@import url("chrome://global/content/xml/XMLPrettyPrint.css");
 
 #top > table {
   font-family: monospace;
diff --git a/mozilla/content/xml/document/resources/XMLPrettyPrint.xsl b/mozilla/content/xml/document/resources/XMLPrettyPrint.xsl
index ad4125f9cf3..d994b89f0aa 100644
--- a/mozilla/content/xml/document/resources/XMLPrettyPrint.xsl
+++ b/mozilla/content/xml/document/resources/XMLPrettyPrint.xsl
@@ -45,8 +45,8 @@
   <xsl:output method="xml"/>
 
   <xsl:template match="/">
-    <link href="chrome://communicator/content/xml/XMLPrettyPrint.css" type="text/css" rel="stylesheet"/>
-    <link title="Monospace" href="chrome://communicator/content/xml/XMLMonoPrint.css" type="text/css" rel="alternate stylesheet"/>
+    <link href="chrome://global/content/xml/XMLPrettyPrint.css" type="text/css" rel="stylesheet"/>
+    <link title="Monospace" href="chrome://global/content/xml/XMLMonoPrint.css" type="text/css" rel="alternate stylesheet"/>
     <div id="header">
       <p>
         &xml.nostylesheet;
diff --git a/mozilla/content/xml/document/resources/jar.mn b/mozilla/content/xml/document/resources/jar.mn
index d089a641308..9c299945330 100644
--- a/mozilla/content/xml/document/resources/jar.mn
+++ b/mozilla/content/xml/document/resources/jar.mn
@@ -1,5 +1,5 @@
-comm.jar:
-    content/communicator/xml/XMLPrettyPrint.css                 (XMLPrettyPrint.css)
-    content/communicator/xml/XMLMonoPrint.css                   (XMLMonoPrint.css)
-    content/communicator/xml/XMLPrettyPrint.xml                 (XMLPrettyPrint.xml)
-    content/communicator/xml/XMLPrettyPrint.xsl                 (XMLPrettyPrint.xsl)
+toolkit.jar:
+    content/global/xml/XMLPrettyPrint.css                 (XMLPrettyPrint.css)
+    content/global/xml/XMLMonoPrint.css                   (XMLMonoPrint.css)
+    content/global/xml/XMLPrettyPrint.xml                 (XMLPrettyPrint.xml)
+    content/global/xml/XMLPrettyPrint.xsl                 (XMLPrettyPrint.xsl)
diff --git a/mozilla/content/xml/document/src/nsXMLPrettyPrinter.cpp b/mozilla/content/xml/document/src/nsXMLPrettyPrinter.cpp
index fb005b6ce13..034f65c5b46 100644
--- a/mozilla/content/xml/document/src/nsXMLPrettyPrinter.cpp
+++ b/mozilla/content/xml/document/src/nsXMLPrettyPrinter.cpp
@@ -124,7 +124,7 @@ nsXMLPrettyPrinter::PrettyPrint(nsIDocument* aDocument)
     // Load the XSLT
     nsCOMPtr<nsIURI> xslUri;
     rv = NS_NewURI(getter_AddRefs(xslUri),
-                   NS_LITERAL_CSTRING("chrome://communicator/content/xml/XMLPrettyPrint.xsl"));
+                   NS_LITERAL_CSTRING("chrome://global/content/xml/XMLPrettyPrint.xsl"));
     NS_ENSURE_SUCCESS(rv, rv);
 
     nsCOMPtr<nsIChannel> channel;
@@ -158,7 +158,7 @@ nsXMLPrettyPrinter::PrettyPrint(nsIDocument* aDocument)
     NS_ENSURE_TRUE(xblDoc, NS_ERROR_FAILURE);
 
     nsCOMPtr<nsIDOMDocument> dummy;
-    xblDoc->LoadBindingDocument(NS_LITERAL_STRING("chrome://communicator/content/xml/XMLPrettyPrint.xml"),
+    xblDoc->LoadBindingDocument(NS_LITERAL_STRING("chrome://global/content/xml/XMLPrettyPrint.xml"),
                                 getter_AddRefs(dummy));
 
     nsCOMPtr<nsIDOMElement> rootElem;
@@ -166,7 +166,7 @@ nsXMLPrettyPrinter::PrettyPrint(nsIDocument* aDocument)
     NS_ENSURE_TRUE(rootElem, NS_ERROR_UNEXPECTED);
 
     rv = xblDoc->AddBinding(rootElem,
-                            NS_LITERAL_STRING("chrome://communicator/content/xml/XMLPrettyPrint.xml#prettyprint"));
+                            NS_LITERAL_STRING("chrome://global/content/xml/XMLPrettyPrint.xml#prettyprint"));
     NS_ENSURE_SUCCESS(rv, rv);
 
     // Hand the result document to the binding
@@ -228,7 +228,7 @@ nsXMLPrettyPrinter::EndUpdate(nsIDocument* aDocument, nsUpdateType aUpdateType)
         if (rootElem) {
             nsCOMPtr<nsIDOMDocumentXBL> xblDoc = do_QueryInterface(mDocument);
             xblDoc->RemoveBinding(rootElem,
-                                  NS_LITERAL_STRING("chrome://communicator/content/xml/XMLPrettyPrint.xml#prettyprint"));
+                                  NS_LITERAL_STRING("chrome://global/content/xml/XMLPrettyPrint.xml#prettyprint"));
         }
 
         mDocument = nsnull;