From 8123cbe82736ece8eda7593c0e33015db98bfd01 Mon Sep 17 00:00:00 2001
From: "bugzilla%standard8.demon.co.uk"
 <bugzilla%standard8.demon.co.uk@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 23 Mar 2007 15:51:54 +0000
Subject: [PATCH] Part of Bug 374404 Don't ship WidgetStateManager as part of
 toolkit - make SeaMonkey use xpfe's wsm. r/sr=Neil.

git-svn-id: svn://10.0.0.236/trunk@222264 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/suite/common/jar.mn        | 1 +
 mozilla/suite/common/pref/pref.xul | 2 +-
 mozilla/xpfe/global/jar.mn         | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mozilla/suite/common/jar.mn b/mozilla/suite/common/jar.mn
index ff8a78c5a07..42b78a78bbc 100644
--- a/mozilla/suite/common/jar.mn
+++ b/mozilla/suite/common/jar.mn
@@ -123,6 +123,7 @@ comm.jar:
    content/communicator/permissions/permissionsOverlay.js           (permissions/permissionsOverlay.js)
    content/communicator/permissions/treeUtils.js                    (permissions/treeUtils.js)
    content/communicator/pref/nsPrefWindow.js                        (pref/nsPrefWindow.js)
+   content/communicator/pref/nsWidgetStateManager.js                (/xpfe/global/resources/content/nsWidgetStateManager.js)
    content/communicator/pref/overrideHandler.js                     (pref/overrideHandler.js)
    content/communicator/pref/permissionsPrefsOverlay.xul            (pref/permissionsPrefsOverlay.xul)
    content/communicator/pref/pref.xul                               (pref/pref.xul)
diff --git a/mozilla/suite/common/pref/pref.xul b/mozilla/suite/common/pref/pref.xul
index 4a15f244a9e..11e18a038e3 100644
--- a/mozilla/suite/common/pref/pref.xul
+++ b/mozilla/suite/common/pref/pref.xul
@@ -26,7 +26,7 @@
 
   <stringbundle id="bundle_prefutilities"
                src="chrome://communicator/locale/pref/prefutilities.properties"/>
-  <script type="application/x-javascript" src="chrome://global/content/nsWidgetStateManager.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/pref/nsWidgetStateManager.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/pref/nsPrefWindow.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-help.js"/>
   <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
diff --git a/mozilla/xpfe/global/jar.mn b/mozilla/xpfe/global/jar.mn
index 68f141eb4c5..1346f6eba00 100644
--- a/mozilla/xpfe/global/jar.mn
+++ b/mozilla/xpfe/global/jar.mn
@@ -16,7 +16,6 @@ toolkit.jar:
         content/global/charsetOverlay.js            (resources/content/charsetOverlay.js) 
         content/global/selectDialog.js              (resources/content/selectDialog.js) 
         content/global/selectDialog.xul             (resources/content/selectDialog.xul) 
-        content/global/nsWidgetStateManager.js      (resources/content/nsWidgetStateManager.js) 
         content/global/nsTreeController.js          (resources/content/nsTreeController.js) 
         content/global/nsTreeSorting.js             (resources/content/nsTreeSorting.js) 
         content/global/nsClipboard.js               (resources/content/nsClipboard.js) 
@@ -82,6 +81,7 @@ toolkit.jar:
         content/global/hiddenWindow.xul             (resources/content/hiddenWindow.xul) 
         content/global/fullScreen.js                (resources/content/fullScreen.js)
         content/global/build.dtd                    (build.dtd)
+        content/global/nsWidgetStateManager.js      (resources/content/nsWidgetStateManager.js)
 #endif
 
 en-US.jar: