From 22e002f4a63d9935d2ade892491ea13df29ace63 Mon Sep 17 00:00:00 2001
From: Richard Marti <richard.marti@gmail.com>
Date: Fri, 11 Dec 2020 10:09:34 +0200
Subject: [PATCH] Bug 1681659 - Port bug 1674806: Remove windowtype attribute
 from mail/components/preferences. r=mkmelin

---
 mail/components/preferences/cookies.xhtml           | 2 +-
 mail/components/preferences/passwordManager.xhtml   | 1 -
 mail/components/preferences/permissions.xhtml       | 1 -
 mail/components/preferences/preferences.xhtml       | 1 -
 mailnews/base/prefs/content/AccountManager.xhtml    | 4 ++--
 mailnews/base/prefs/content/am-archiveoptions.xhtml | 4 ++--
 mailnews/base/prefs/content/removeAccount.xhtml     | 3 +--
 7 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/mail/components/preferences/cookies.xhtml b/mail/components/preferences/cookies.xhtml
index 064e0dfbca..223ca4766b 100644
--- a/mail/components/preferences/cookies.xhtml
+++ b/mail/components/preferences/cookies.xhtml
@@ -10,7 +10,7 @@
 
 <!DOCTYPE dialog>
 
-<window id="CookiesDialog" windowtype="mailnews:cookies"
+<window id="CookiesDialog"
         class="windowDialog"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
diff --git a/mail/components/preferences/passwordManager.xhtml b/mail/components/preferences/passwordManager.xhtml
index fbbc095eb3..e4ed3547b1 100644
--- a/mail/components/preferences/passwordManager.xhtml
+++ b/mail/components/preferences/passwordManager.xhtml
@@ -7,7 +7,6 @@
 <?xml-stylesheet href="chrome://messenger/skin/shared/preferences/passwordmgr.css"?>
 
 <window id="SignonViewerDialog"
-        windowtype="Toolkit:PasswordManager"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         onload="Startup();"
diff --git a/mail/components/preferences/permissions.xhtml b/mail/components/preferences/permissions.xhtml
index 1fdc9b2c89..24dd78403f 100644
--- a/mail/components/preferences/permissions.xhtml
+++ b/mail/components/preferences/permissions.xhtml
@@ -10,7 +10,6 @@
 <!DOCTYPE dialog>
 
 <window id="PermissionsDialog" class="windowDialog"
-        windowtype="mailnews:permissions"
         data-l10n-id="permissions-reminder-window"
         data-l10n-attrs="style"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
diff --git a/mail/components/preferences/preferences.xhtml b/mail/components/preferences/preferences.xhtml
index 5c17762990..bbd0e67d8d 100644
--- a/mail/components/preferences/preferences.xhtml
+++ b/mail/components/preferences/preferences.xhtml
@@ -33,7 +33,6 @@
 ]>
 
 <window id="MailPreferences"
-        windowtype="Mail:Preferences"
         role="document"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
diff --git a/mailnews/base/prefs/content/AccountManager.xhtml b/mailnews/base/prefs/content/AccountManager.xhtml
index 82a32124ea..f434d265d2 100644
--- a/mailnews/base/prefs/content/AccountManager.xhtml
+++ b/mailnews/base/prefs/content/AccountManager.xhtml
@@ -13,8 +13,8 @@
   %utilityDTD;
 ]>
 
-<window windowtype="mailnews:accountmanager"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns:html="http://www.w3.org/1999/xhtml"
         title="&accountManagerTitle.label;"
         csp="default-src chrome:; script-src chrome: 'unsafe-inline'; img-src chrome: moz-icon: https: data:; style-src chrome: data: 'unsafe-inline'; object-src 'none'"
         persist="width height screenX screenY"
diff --git a/mailnews/base/prefs/content/am-archiveoptions.xhtml b/mailnews/base/prefs/content/am-archiveoptions.xhtml
index 12308fb15c..5754f1a8ae 100644
--- a/mailnews/base/prefs/content/am-archiveoptions.xhtml
+++ b/mailnews/base/prefs/content/am-archiveoptions.xhtml
@@ -9,8 +9,8 @@
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-archiveoptions.dtd" >
 
-<window windowtype="Mailnews:archiveOptions"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns:html="http://www.w3.org/1999/xhtml"
         title="&dialogTitle.label;"
         width="350" height="350"
         persist="width height"
diff --git a/mailnews/base/prefs/content/removeAccount.xhtml b/mailnews/base/prefs/content/removeAccount.xhtml
index 544d1f0303..14d054fc7a 100644
--- a/mailnews/base/prefs/content/removeAccount.xhtml
+++ b/mailnews/base/prefs/content/removeAccount.xhtml
@@ -13,8 +13,7 @@
 %removalDTD;
 ]>
 
-<window windowtype="Mailnews:removeAccount"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         title="&dialogTitle;"
         width="600"