Bug 1604727 - Migrate .xul files in preferences to .xhtml. r=mkmelin

--HG--
rename : mail/base/content/newTagDialog.xul => mail/base/content/newTagDialog.xhtml
rename : mail/base/content/systemIntegrationDialog.xul => mail/base/content/systemIntegrationDialog.xhtml
rename : mail/components/preferences/aboutPreferences.xul => mail/components/preferences/aboutPreferences.xhtml
rename : mail/components/preferences/applicationManager.xul => mail/components/preferences/applicationManager.xhtml
rename : mail/components/preferences/attachmentReminder.xul => mail/components/preferences/attachmentReminder.xhtml
rename : mail/components/preferences/chat.inc.xul => mail/components/preferences/chat.inc.xhtml
rename : mail/components/preferences/colors.xul => mail/components/preferences/colors.xhtml
rename : mail/components/preferences/compose.inc.xul => mail/components/preferences/compose.inc.xhtml
rename : mail/components/preferences/connection.xul => mail/components/preferences/connection.xhtml
rename : mail/components/preferences/cookies.xul => mail/components/preferences/cookies.xhtml
rename : mail/components/preferences/dockoptions.xul => mail/components/preferences/dockoptions.xhtml
rename : mail/components/preferences/fonts.xul => mail/components/preferences/fonts.xhtml
rename : mail/components/preferences/general.inc.xul => mail/components/preferences/general.inc.xhtml
rename : mail/components/preferences/messengerLanguages.xul => mail/components/preferences/messengerLanguages.xhtml
rename : mail/components/preferences/notifications.xul => mail/components/preferences/notifications.xhtml
rename : mail/components/preferences/offline.xul => mail/components/preferences/offline.xhtml
rename : mail/components/preferences/passwordManager.xul => mail/components/preferences/passwordManager.xhtml
rename : mail/components/preferences/permissions.xul => mail/components/preferences/permissions.xhtml
rename : mail/components/preferences/privacy.inc.xul => mail/components/preferences/privacy.inc.xhtml
rename : mail/components/preferences/receipts.xul => mail/components/preferences/receipts.xhtml
rename : mail/components/preferences/sendoptions.xul => mail/components/preferences/sendoptions.xhtml
rename : mailnews/addrbook/prefs/content/pref-editdirectories.xul => mailnews/addrbook/prefs/content/pref-editdirectories.xhtml

mail/base/content/macMessengerMenu.js

@@ -37,7 +37,7 @@ function loadListener(event) {
   setTimeout(function() {
     let prefWin = Services.wm.getMostRecentWindow("Mail:Preferences");
     prefWin.gSubDialog.open(
-      "chrome://messenger/content/preferences/dockoptions.xul"
+      "chrome://messenger/content/preferences/dockoptions.xhtml"
     );
   });
 }
@@ -68,7 +68,7 @@ function openDockOptions() {
 
   if (win) {
     openOptionsDialog("paneGeneral");
-    win.gSubDialog("chrome://messenger/content/preferences/dockoptions.xul");
+    win.gSubDialog("chrome://messenger/content/preferences/dockoptions.xhtml");
   } else {
     Services.ww.registerNotification(new PrefWindowObserver());
     openOptionsDialog("paneGeneral");

mail/base/content/msgMail3PaneWindow.js

@@ -685,7 +685,7 @@ function LoadPostAccountWizard() {
           !SearchIntegration.firstRunDone)
       ) {
         window.openDialog(
-          "chrome://messenger/content/systemIntegrationDialog.xul",
+          "chrome://messenger/content/systemIntegrationDialog.xhtml",
           "SystemIntegration",
           "modal,centerscreen,chrome,resizable=no"
         );

mail/base/jar.mn

@@ -58,7 +58,7 @@ messenger.jar:
 *   content/messenger/aboutDialog.xul               (content/aboutDialog.xul)
     content/messenger/aboutDialog.js                (content/aboutDialog.js)
 *   content/messenger/aboutRights.xhtml             (content/aboutRights.xhtml)
-*   content/messenger/systemIntegrationDialog.xul   (content/systemIntegrationDialog.xul)
+*   content/messenger/systemIntegrationDialog.xhtml (content/systemIntegrationDialog.xhtml)
     content/messenger/systemIntegrationDialog.js    (content/systemIntegrationDialog.js)
     content/messenger/folderPane.js                 (content/folderPane.js)
     content/messenger/messenger-customization.js    (content/messenger-customization.js)
@@ -75,7 +75,7 @@ messenger.jar:
     content/messenger/tabbrowser-tab.js             (content/tabbrowser-tab.js)
     content/messenger/tabmail.css                   (content/tabmail.css)
     content/messenger/statuspanel.js                (content/statuspanel.js)
-    content/messenger/newTagDialog.xul              (content/newTagDialog.xul)
+    content/messenger/newTagDialog.xhtml            (content/newTagDialog.xhtml)
     content/messenger/newTagDialog.js               (content/newTagDialog.js)
     content/messenger/composerOverlay.css           (content/composerOverlay.css)
     content/messenger/threadPane.js                 (content/threadPane.js)

mail/components/preferences/aboutPreferences.xhtml

@@ -106,10 +106,10 @@
       <hbox id="preferencesContainer" flex="1">
         <hbox class="paneDeckContainer" flex="1">
           <hbox id="paneDeck" flex="1">
-#include general.inc.xul
-#include compose.inc.xul
-#include privacy.inc.xul
-#include chat.inc.xul
+#include general.inc.xhtml
+#include compose.inc.xhtml
+#include privacy.inc.xhtml
+#include chat.inc.xhtml
             <prefpane id="paneLightning" label="&paneLightning.title;"/>
           </hbox>
         </hbox>

mail/components/preferences/compose.js

@@ -84,12 +84,12 @@ var gComposePane = {
   },
 
   sendOptionsDialog() {
-    gSubDialog.open("chrome://messenger/content/preferences/sendoptions.xul");
+    gSubDialog.open("chrome://messenger/content/preferences/sendoptions.xhtml");
   },
 
   attachmentReminderOptionsDialog() {
     gSubDialog.open(
-      "chrome://messenger/content/preferences/attachmentReminder.xul",
+      "chrome://messenger/content/preferences/attachmentReminder.xhtml",
       "resizable=no"
     );
   },
@@ -156,7 +156,7 @@ var gComposePane = {
 
   editDirectories() {
     gSubDialog.open(
-      "chrome://messenger/content/addressbook/pref-editdirectories.xul"
+      "chrome://messenger/content/addressbook/pref-editdirectories.xhtml"
     );
   },
 

mail/components/preferences/general.js

@@ -476,14 +476,14 @@ var gGeneralPane = {
 
   customizeMailAlert() {
     gSubDialog.open(
-      "chrome://messenger/content/preferences/notifications.xul",
+      "chrome://messenger/content/preferences/notifications.xhtml",
       "resizable=no"
     );
   },
 
   configureDockOptions() {
     gSubDialog.open(
-      "chrome://messenger/content/preferences/dockoptions.xul",
+      "chrome://messenger/content/preferences/dockoptions.xhtml",
       "resizable=no"
     );
   },
@@ -743,7 +743,7 @@ var gGeneralPane = {
 
     // otherwise, bring up the default client dialog
     gSubDialog.open(
-      "chrome://messenger/content/systemIntegrationDialog.xul",
+      "chrome://messenger/content/systemIntegrationDialog.xhtml",
       "resizable=no",
       "calledFromPrefs"
     );
@@ -849,7 +849,7 @@ var gGeneralPane = {
    * configured.
    */
   configureFonts() {
-    gSubDialog.open("chrome://messenger/content/preferences/fonts.xul");
+    gSubDialog.open("chrome://messenger/content/preferences/fonts.xhtml");
   },
 
   /**
@@ -858,7 +858,7 @@ var gGeneralPane = {
    */
   configureColors() {
     gSubDialog.open(
-      "chrome://messenger/content/preferences/colors.xul",
+      "chrome://messenger/content/preferences/colors.xhtml",
       "resizable=no"
     );
   },
@@ -1026,7 +1026,7 @@ var gGeneralPane = {
   showMessengerLanguages({ search }) {
     let opts = { selected: gGeneralPane.selectedLocales, search };
     gSubDialog.open(
-      "chrome://messenger/content/preferences/messengerLanguages.xul",
+      "chrome://messenger/content/preferences/messengerLanguages.xhtml",
       null,
       opts,
       this.messengerLanguagesClosed
@@ -1198,7 +1198,7 @@ var gGeneralPane = {
         okCallback: editTagCallback,
       };
       gSubDialog.open(
-        "chrome://messenger/content/newTagDialog.xul",
+        "chrome://messenger/content/newTagDialog.xhtml",
         "resizable=no",
         args
       );
@@ -1208,7 +1208,7 @@ var gGeneralPane = {
   addTag() {
     var args = { result: "", okCallback: addTagCallback };
     gSubDialog.open(
-      "chrome://messenger/content/newTagDialog.xul",
+      "chrome://messenger/content/newTagDialog.xhtml",
       "resizable=no",
       args
     );
@@ -1269,7 +1269,7 @@ var gGeneralPane = {
    */
   showReturnReceipts() {
     gSubDialog.open(
-      "chrome://messenger/content/preferences/receipts.xul",
+      "chrome://messenger/content/preferences/receipts.xhtml",
       "resizable=no"
     );
   },
@@ -1282,7 +1282,7 @@ var gGeneralPane = {
    * Display the the connection settings dialog.
    */
   showConnections() {
-    gSubDialog.open("chrome://messenger/content/preferences/connection.xul");
+    gSubDialog.open("chrome://messenger/content/preferences/connection.xhtml");
   },
 
   /**
@@ -1290,7 +1290,7 @@ var gGeneralPane = {
    */
   showOffline() {
     gSubDialog.open(
-      "chrome://messenger/content/preferences/offline.xul",
+      "chrome://messenger/content/preferences/offline.xhtml",
       "resizable=no"
     );
   },
@@ -2048,7 +2048,7 @@ var gGeneralPane = {
     };
 
     gSubDialog.open(
-      "chrome://messenger/content/preferences/applicationManager.xul",
+      "chrome://messenger/content/preferences/applicationManager.xhtml",
       "resizable=no",
       handlerInfo,
       closingCallback

mail/components/preferences/jar.mn

@@ -3,47 +3,47 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 messenger.jar:
-*   content/messenger/preferences/aboutPreferences.xul
+*   content/messenger/preferences/aboutPreferences.xhtml
     content/messenger/preferences/preferences.js
     content/messenger/preferences/preferencesTab.js
     content/messenger/preferences/general.js
 #ifdef XP_MACOSX
     content/messenger/preferences/dockoptions.js
-    content/messenger/preferences/dockoptions.xul
+    content/messenger/preferences/dockoptions.xhtml
 #endif
     content/messenger/preferences/chat.js
     content/messenger/preferences/messagestyle.js
     content/messenger/preferences/messengerLanguages.js
-    content/messenger/preferences/messengerLanguages.xul
+    content/messenger/preferences/messengerLanguages.xhtml
     content/messenger/preferences/colors.js
-*   content/messenger/preferences/colors.xul
+*   content/messenger/preferences/colors.xhtml
     content/messenger/preferences/compose.js
     content/messenger/preferences/privacy.js
-    content/messenger/preferences/sendoptions.xul
+    content/messenger/preferences/sendoptions.xhtml
     content/messenger/preferences/sendoptions.js
     content/messenger/preferences/receipts.js
-    content/messenger/preferences/receipts.xul
+    content/messenger/preferences/receipts.xhtml
     content/messenger/preferences/connection.js
-*   content/messenger/preferences/connection.xul
+*   content/messenger/preferences/connection.xhtml
     content/messenger/preferences/downloads.js
     content/messenger/preferences/attachmentReminder.js
-    content/messenger/preferences/attachmentReminder.xul
-    content/messenger/preferences/applicationManager.xul
+    content/messenger/preferences/attachmentReminder.xhtml
+    content/messenger/preferences/applicationManager.xhtml
     content/messenger/preferences/applicationManager.js
     content/messenger/preferences/handlers.css
     content/messenger/preferences/actionsshared.js
     content/messenger/preferences/fonts.js
-    content/messenger/preferences/fonts.xul
+    content/messenger/preferences/fonts.xhtml
 #ifndef XP_MACOSX
     content/messenger/preferences/notifications.js
-    content/messenger/preferences/notifications.xul
+    content/messenger/preferences/notifications.xhtml
 #endif
     content/messenger/preferences/offline.js
-    content/messenger/preferences/offline.xul
+    content/messenger/preferences/offline.xhtml
     content/messenger/preferences/cookies.js
-*   content/messenger/preferences/cookies.xul
+*   content/messenger/preferences/cookies.xhtml
     content/messenger/preferences/passwordManager.js
-    content/messenger/preferences/passwordManager.xul
+    content/messenger/preferences/passwordManager.xhtml
     content/messenger/preferences/permissions.js
-    content/messenger/preferences/permissions.xul
+    content/messenger/preferences/permissions.xhtml
     content/messenger/preferences/subdialogs.js

mail/components/preferences/privacy.js

@@ -151,7 +151,7 @@ var gPrivacyPane = {
       introText: bundle.getString("cookiepermissionstext"),
     };
     gSubDialog.open(
-      "chrome://messenger/content/preferences/permissions.xul",
+      "chrome://messenger/content/preferences/permissions.xhtml",
       null,
       params
     );
@@ -161,7 +161,7 @@ var gPrivacyPane = {
    * Displays all the user's cookies in a dialog.
    */
   showCookies(aCategory) {
-    gSubDialog.open("chrome://messenger/content/preferences/cookies.xul");
+    gSubDialog.open("chrome://messenger/content/preferences/cookies.xhtml");
   },
 
   /**
@@ -214,7 +214,7 @@ var gPrivacyPane = {
       introText: bundle.getString("imagepermissionstext"),
     };
     gSubDialog.open(
-      "chrome://messenger/content/preferences/permissions.xul",
+      "chrome://messenger/content/preferences/permissions.xhtml",
       null,
       params
     );
@@ -329,7 +329,7 @@ var gPrivacyPane = {
    */
   showPasswords() {
     gSubDialog.open(
-      "chrome://messenger/content/preferences/passwordManager.xul"
+      "chrome://messenger/content/preferences/passwordManager.xhtml"
     );
   },
 

mail/test/browser/pref-window/browser_fontChooser.js

@@ -176,7 +176,7 @@ function _verify_fonts_displayed(aDefaults, aSerif, aSansSerif, aMonospace) {
     prefTab.browser.contentDocument
       .getElementById("dialogOverlay-0")
       .querySelector("browser"),
-    "chrome://messenger/content/preferences/fonts.xul"
+    "chrome://messenger/content/preferences/fonts.xhtml"
   );
 
   // The font pickers are populated async so we need to wait for it.

mail/test/mozmill/pref-window/test-font-chooser.js

@@ -135,7 +135,7 @@ function _verify_fonts_displayed(aDefaults, aSerif, aSansSerif, aMonospace) {
     prefTab.browser.contentDocument
       .getElementById("dialogOverlay-0")
       .querySelector("browser"),
-    "chrome://messenger/content/preferences/fonts.xul"
+    "chrome://messenger/content/preferences/fonts.xhtml"
   );
 
   // The font pickers are populated async so we need to wait for it.

mail/test/mozmill/shared-modules/PrefTabHelpers.jsm

@@ -22,7 +22,7 @@ var cth = ChromeUtils.import(
 
 /**
  * Open the preferences tab with the given pane displayed. The pane needs to
- * be one of the prefpane ids in mail/components/preferences/aboutPreferences.xul.
+ * be one of the prefpane ids in mail/components/preferences/aboutPreferences.xhtml.
  *
  * @param aPaneID The ID of the pref pane to display (see
  *     mail/components/preferences/aboutPreferences.xul for valid IDs.)

mailnews/jar.mn

@@ -6,7 +6,7 @@ messenger.jar:
     content/messenger/addressbook/pref-directory-add.js                        (addrbook/prefs/content/pref-directory-add.js)
     content/messenger/addressbook/pref-directory-add.xul                       (addrbook/prefs/content/pref-directory-add.xul)
     content/messenger/addressbook/pref-editdirectories.js                      (addrbook/prefs/content/pref-editdirectories.js)
-    content/messenger/addressbook/pref-editdirectories.xul                     (addrbook/prefs/content/pref-editdirectories.xul)
+    content/messenger/addressbook/pref-editdirectories.xhtml                   (addrbook/prefs/content/pref-editdirectories.xhtml)
     content/messenger/addressbook/abAddressBookNameDialog.js                   (addrbook/content/abAddressBookNameDialog.js)
     content/messenger/addressbook/abAddressBookNameDialog.xul                  (addrbook/content/abAddressBookNameDialog.xul)
     content/messenger/addressbook/abResultsPane.js                             (addrbook/content/abResultsPane.js)