From ca7e4a708b8e4a49055d1d3667de9ad5b02a2b34 Mon Sep 17 00:00:00 2001
From: "mhammond%skippinet.com.au"
 <mhammond%skippinet.com.au@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 5 Feb 2006 12:56:57 +0000
Subject: [PATCH] s\chrome://communicator/skin/\chrome://global/skin/\ and
 disable the painful iframe

git-svn-id: svn://10.0.0.236/branches/DOM_AGNOSTIC2_BRANCH@188955 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/extensions/python/dom/test/pyxultest/dialog.xul    | 2 +-
 mozilla/extensions/python/dom/test/pyxultest/jar.mn        | 1 +
 mozilla/extensions/python/dom/test/pyxultest/pytester.xul  | 2 +-
 mozilla/extensions/python/dom/test/pyxultest/pyxultest.xul | 6 ++++--
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/mozilla/extensions/python/dom/test/pyxultest/dialog.xul b/mozilla/extensions/python/dom/test/pyxultest/dialog.xul
index 2c94164c5b2..65f6586700a 100644
--- a/mozilla/extensions/python/dom/test/pyxultest/dialog.xul
+++ b/mozilla/extensions/python/dom/test/pyxultest/dialog.xul
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
 <!-- note: nsXBLPrototypeHandler::ExecuteHandler is still JS specific,
 so 'ondialogaccept' handler does not execute Python
diff --git a/mozilla/extensions/python/dom/test/pyxultest/jar.mn b/mozilla/extensions/python/dom/test/pyxultest/jar.mn
index 50daf313365..7b9459dd5a3 100644
--- a/mozilla/extensions/python/dom/test/pyxultest/jar.mn
+++ b/mozilla/extensions/python/dom/test/pyxultest/jar.mn
@@ -9,3 +9,4 @@ pyxultest.jar:
     content/pyxultest/js_overlay.xul		                (js_overlay.xul)
     content/pyxultest/pytester.xul		                (pytester.xul)
     content/pyxultest/pytester.py		                (pytester.py)
+    content/pyxultest/html_content.html     (html_content.html)
diff --git a/mozilla/extensions/python/dom/test/pyxultest/pytester.xul b/mozilla/extensions/python/dom/test/pyxultest/pytester.xul
index 02841ee4779..38941f4022b 100644
--- a/mozilla/extensions/python/dom/test/pyxultest/pytester.xul
+++ b/mozilla/extensions/python/dom/test/pyxultest/pytester.xul
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
 <!-- A container for general test code.  Relies on being passed an argument
      for which test to run.  Generally it runs the test and closes, only
diff --git a/mozilla/extensions/python/dom/test/pyxultest/pyxultest.xul b/mozilla/extensions/python/dom/test/pyxultest/pyxultest.xul
index 46a1e233000..312d6b3311d 100644
--- a/mozilla/extensions/python/dom/test/pyxultest/pyxultest.xul
+++ b/mozilla/extensions/python/dom/test/pyxultest/pyxultest.xul
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
 <?xul-overlay href="chrome://pyxultest/content/js_overlay.xul"?>
 <?xul-overlay href="chrome://pyxultest/content/python_overlay.xul"?>
@@ -103,7 +103,9 @@ dump("Window location is %s", this.window.location.href)
            value = "If you can see this, things aren't working well!"
            rows="15" multiline="true" flex="1"
   />
-
+<!--
+  <iframe src="chrome://pyxultest/content/html_content.html" height="30"/>
+-->
   <groupbox>
     <caption label="Items from Overlays"/>
     <!-- A box from our overlay - it will have one button using js events