Bug 1512963 - rename XUL .inc files to .inc.xul. r=aceman
authorMagnus Melin <mkmelin+mozilla@iki.fi>
Sun, 23 Dec 2018 14:49:49 +0200
changeset 34054 4b4b0e0cbb003a50dc8a451f5832e5cac617a497
parent 34053 061051149fae89a285b3c912036e8c2cc65447bd
child 34055 2c3b0e1ad6a2448285b7a2d9361ebae2515c0de9
push id389
push userclokep@gmail.com
push dateMon, 18 Mar 2019 19:01:53 +0000
reviewersaceman
bugs1512963
Bug 1512963 - rename XUL .inc files to .inc.xul. r=aceman find mail mailnews editor -name "*.inc" -type f ! -name defines.inc | xargs -I '{}' sh -c 'b=$(basename $1); find mail mailnews editor -type f | xargs sed -i -e "s/$b/$b.xul/g"' -- {} find mail mailnews editor -name "*.inc" -type f ! -name defines.inc | xargs -I {} hg mv {} {}.xul
editor/ui/dialogs/content/EdImageProps.xul
editor/ui/dialogs/content/EdInputImage.xul
editor/ui/dialogs/content/edImage.inc
editor/ui/dialogs/content/edImage.inc.xul
mail/base/content/ABSearchDialog.xul
mail/base/content/SearchDialog.xul
mail/base/content/editContactPanel.inc
mail/base/content/editContactPanel.inc.xul
mail/base/content/helpMenu.inc
mail/base/content/helpMenu.inc.xul
mail/base/content/hiddenWindow.xul
mail/base/content/macWindowMenu.inc
mail/base/content/macWindowMenu.inc.xul
mail/base/content/mainCommandSet.inc
mail/base/content/mainCommandSet.inc.xul
mail/base/content/mainKeySet.inc
mail/base/content/mainKeySet.inc.xul
mail/base/content/mainMailToolbox.inc
mail/base/content/mainMailToolbox.inc.xul
mail/base/content/mainNavigationToolbox.inc
mail/base/content/mainNavigationToolbox.inc.xul
mail/base/content/mainPopupSet.inc
mail/base/content/mainPopupSet.inc.xul
mail/base/content/mainStatusbar.inc
mail/base/content/mainStatusbar.inc.xul
mail/base/content/messageWindow.xul
mail/base/content/messenger.xul
mail/base/content/msgAttachmentView.inc
mail/base/content/msgAttachmentView.inc.xul
mail/base/content/msgHdrPopup.inc
mail/base/content/msgHdrPopup.inc.xul
mail/base/content/msgHdrView.inc
mail/base/content/msgHdrView.inc.xul
mail/base/content/quickFilterBar.inc
mail/base/content/quickFilterBar.inc.xul
mail/components/addrbook/content/abCard.inc
mail/components/addrbook/content/abCard.inc.xul
mail/components/addrbook/content/abEditCardDialog.xul
mail/components/addrbook/content/abNewCardDialog.xul
mail/components/addrbook/content/addressbook.xul
mail/components/compose/content/editFormatButtons.inc
mail/components/compose/content/editFormatButtons.inc.xul
mail/components/compose/content/messengercompose.xul
mail/components/im/content/chat-menu.inc
mail/components/im/content/chat-menu.inc.xul
mail/components/im/content/chat-messenger.inc
mail/components/im/content/chat-messenger.inc.xul
mail/components/preferences/aboutPreferences.xul
mail/components/preferences/doctype.inc
mail/components/preferences/doctype.inc.xul
mail/extensions/mailviews/content/mailViewSetup.xul
mailnews/base/content/virtualFolderProperties.xul
mailnews/base/prefs/content/am-addressing.inc
mailnews/base/prefs/content/am-addressing.inc.xul
mailnews/base/prefs/content/am-addressing.xul
mailnews/base/prefs/content/am-copies.inc
mailnews/base/prefs/content/am-copies.inc.xul
mailnews/base/prefs/content/am-copies.xul
mailnews/base/prefs/content/am-identity-edit.xul
mailnews/base/search/content/FilterEditor.xul
mailnews/base/search/content/searchTerm.inc
mailnews/base/search/content/searchTerm.inc.xul
mailnews/extensions/smime/content/am-smime.inc
mailnews/extensions/smime/content/am-smime.inc.xul
mailnews/extensions/smime/content/am-smime.xul
--- a/editor/ui/dialogs/content/EdImageProps.xul
+++ b/editor/ui/dialogs/content/EdImageProps.xul
@@ -34,17 +34,17 @@
   <tabbox id="TabBox">
     <tabs flex="1">
       <tab id="imageLocationTab" label="&imageLocationTab.label;"/>
       <tab id="imageDimensionsTab" label="&imageDimensionsTab.label;"/>
       <tab id="imageAppearanceTab" label="&imageAppearanceTab.label;"/>
       <tab id="imageLinkTab" label="&imageLinkTab.label;"/>
     </tabs>
     <tabpanels>
-#include edImage.inc
+#include edImage.inc.xul
       <vbox>
         <spacer class="spacer"/>
         <vbox id="LinkLocationBox">
           <label control="hrefInput"
                  accesskey="&LinkURLEditField2.accessKey;"
                  width="1">&LinkURLEditField2.label;</label>
           <textbox id="hrefInput" type="autocomplete"
                    autocompletesearch="unifiedcomplete" timeout="50" maxrows="6"
--- a/editor/ui/dialogs/content/EdInputImage.xul
+++ b/editor/ui/dialogs/content/EdInputImage.xul
@@ -53,17 +53,17 @@
               <label value="&tabIndex.label;"/>
               <hbox>
                 <textbox id="InputTabIndex" class="narrow" oninput="forceInteger(this.id);"/>
               </hbox>
             </row>
           </rows>
         </grid>
       </groupbox>
-#include edImage.inc
+#include edImage.inc.xul
     </tabpanels>
   </tabbox>
 
   <hbox align="end">
     <groupbox id="imagePreview" orient="horizontal" flex="1">
       <label class="header">&previewBox.label;</label>
       <hbox id="preview-image-box" align="center">
         <spacer flex="1"/>
rename from editor/ui/dialogs/content/edImage.inc
rename to editor/ui/dialogs/content/edImage.inc.xul
--- a/mail/base/content/ABSearchDialog.xul
+++ b/mail/base/content/ABSearchDialog.xul
@@ -72,17 +72,17 @@
         <hbox align="center">
           <spacer flex="1"/>
           <button label="&resetButton.label;" oncommand="onAbSearchReset(event);" accesskey="&resetButton.accesskey;"/>
         </hbox>
       </vbox>
 
       <hbox flex="1">
         <vbox id="searchTermListBox" flex="1">
-#include ../../../mailnews/base/search/content/searchTerm.inc
+#include ../../../mailnews/base/search/content/searchTerm.inc.xul
       </hbox>
     </vbox>
 
     <splitter id="gray_horizontal_splitter" collapse="after" persist="state" orient="vertical"/>
 
     <vbox id="searchResults" flex="4" persist="height">
       <vbox id="searchResultListBox" flex="1" >
         <tree id="abResultsTree" flex="1" enableColumnDrag="true" class="plain"
--- a/mail/base/content/SearchDialog.xul
+++ b/mail/base/content/SearchDialog.xul
@@ -110,17 +110,17 @@
                     accesskey="&searchOnServer.accesskey;"
                     oncommand="updateSearchLocalSystem();"
                     persist="checked"/>
         </hbox>
       </vbox>
 
       <hbox flex="1">
         <vbox id="searchTermListBox" flex="1">
-#include ../../../mailnews/base/search/content/searchTerm.inc
+#include ../../../mailnews/base/search/content/searchTerm.inc.xul
       </hbox>
     </vbox>
 
     <splitter id="gray_horizontal_splitter" persist="state" orient="vertical"/>
 
     <vbox id="searchResults" flex="4" persist="height">
       <vbox id="searchResultListBox" flex="1">
         <tree id="threadTree" class="plain" persist="lastfoldersent" flex="1"
rename from mail/base/content/editContactPanel.inc
rename to mail/base/content/editContactPanel.inc.xul
rename from mail/base/content/helpMenu.inc
rename to mail/base/content/helpMenu.inc.xul
--- a/mail/base/content/hiddenWindow.xul
+++ b/mail/base/content/hiddenWindow.xul
@@ -68,27 +68,27 @@
   <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
   <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
   <stringbundle id="bundle_offlinePrompts" src="chrome://messenger/locale/offline.properties"/>
   <stringbundle id="charsetBundle" src="chrome://communicator/content/labelsencodings.properties"/>
 </stringbundleset>
 
   <!-- keys are appended from the overlay -->
 <keyset id="mailKeys">
-#include mainKeySet.inc
+#include mainKeySet.inc.xul
   <keyset id="tasksKeys">
     <key id="key_newMessage" key="&newMessageCmd.key;" command="cmd_newMessage"
          modifiers="accel,shift"/>
     <key id="key_newMessage2" key="&newMessageCmd2.key;" command="cmd_newMessage"
          modifiers="accel"/>
   </keyset>
 </keyset>
 
 <commandset id="mailCommands">
-#include mainCommandSet.inc
+#include mainCommandSet.inc.xul
   <commandset id="mailSearchMenuItems"/>
   <commandset id="globalEditMenuItems"
               commandupdater="true"
               events="create-menu-edit"
               oncommandupdate="goUpdateGlobalEditMenuItems()"/>
   <commandset id="selectEditMenuItems"
               commandupdater="true"
               events="create-menu-edit"
@@ -103,17 +103,17 @@
   </commandset>
 </commandset>
 
   <!-- it's the whole mailWindowOverlay.xul menubar! hidden windows need to
        have a menubar for situations where they're the only window remaining
        on a platform that wants to leave the app running, like the Mac.
   -->
 
-#include mainNavigationToolbox.inc
+#include mainNavigationToolbox.inc.xul
   </toolbox>
-#include mainMailToolbox.inc
+#include mainMailToolbox.inc.xul
 
 <browser id="hiddenBrowser" disablehistory="true"/>
 
 </window>
 
 #endif
rename from mail/base/content/macWindowMenu.inc
rename to mail/base/content/macWindowMenu.inc.xul
rename from mail/base/content/mainCommandSet.inc
rename to mail/base/content/mainCommandSet.inc.xul
rename from mail/base/content/mainKeySet.inc
rename to mail/base/content/mainKeySet.inc.xul
rename from mail/base/content/mainMailToolbox.inc
rename to mail/base/content/mainMailToolbox.inc.xul
rename from mail/base/content/mainNavigationToolbox.inc
rename to mail/base/content/mainNavigationToolbox.inc.xul
--- a/mail/base/content/mainNavigationToolbox.inc
+++ b/mail/base/content/mainNavigationToolbox.inc.xul
@@ -940,21 +940,21 @@
         <menuitem id="menu_mac_hide_others" label="&hideOtherAppsCmdMac.label;" key="key_hideOtherAppsCmdMac"/>
         <menuitem id="menu_mac_show_all" label="&showAllAppsCmdMac.label;"/>
 #endif
 #endif
        </menupopup>
       </menu>
 
 #ifdef XP_MACOSX
-#include macWindowMenu.inc
+#include macWindowMenu.inc.xul
 #endif
 
       <!-- Help -->
-#include helpMenu.inc
+#include helpMenu.inc.xul
 
       <spacer id="menubar_spacer" flex="100%"/>
       </menubar>
     </toolbaritem>
 #ifndef XP_MACOSX
     <hbox class="titlebar-placeholder" type="caption-buttons" ordinal="1000"/>
 #endif
   </toolbar>
rename from mail/base/content/mainPopupSet.inc
rename to mail/base/content/mainPopupSet.inc.xul
rename from mail/base/content/mainStatusbar.inc
rename to mail/base/content/mainStatusbar.inc.xul
--- a/mail/base/content/messageWindow.xul
+++ b/mail/base/content/messageWindow.xul
@@ -112,17 +112,17 @@
   <script type="application/javascript" src="chrome://messenger/content/mailCore.js"/>
   <script type="application/javascript" src="chrome://messenger/content/quickFilterBar.js"/>
 #ifdef XP_MACOSX
   <script type="application/javascript" src="chrome://global/content/macWindowMenu.js"/>
 #endif
   <script type="application/javascript" src="chrome://messenger/content/newmailaccount/uriListener.js"/>
 
   <commandset id="mailCommands">
-#include mainCommandSet.inc
+#include mainCommandSet.inc.xul
     <commandset id="mailSearchMenuItems"/>
     <commandset id="attachmentCommands">
       <command id="cmd_openAllAttachments"
                oncommand="goDoCommand('cmd_openAllAttachments');"
                disabled="true"/>
       <command id="cmd_saveAllAttachments"
                oncommand="goDoCommand('cmd_saveAllAttachments');"
                disabled="true"/>
@@ -138,17 +138,17 @@
       <command id="cmd_newCard" oncommand="openNewCardDialog()"/>
     </commandset>
     <commandset id="commandKeys"/>
     <command id="cmd_close" oncommand="window.close();"/>
   </commandset>
 
   <keyset id="mailKeys">
     <key keycode="VK_ESCAPE" oncommand="window.close();"/>
-#include mainKeySet.inc
+#include mainKeySet.inc.xul
     <keyset id="tasksKeys">
 #ifdef XP_MACOSX
       <key id="key_newMessage" key="&newMessageCmd.key;" command="cmd_newMessage"
            modifiers="accel,shift"/>
       <key id="key_newMessage2" key="&newMessageCmd2.key;" command="cmd_newMessage"
            modifiers="accel"/>
 #else
       <key id="key_newMessage"  key="&newMessageCmd.key;" command="cmd_newMessage"
@@ -156,20 +156,20 @@
       <key id="key_newMessage2" key="&newMessageCmd2.key;" command="cmd_newMessage"
            modifiers="accel"/>
 #endif
     </keyset>
   </keyset>
 
   <!-- Popup menus provided by mailWindowOverlay.xul -->
   <popupset id="mainPopupSet">
-#include mainPopupSet.inc
-#include msgHdrPopup.inc
+#include mainPopupSet.inc.xul
+#include msgHdrPopup.inc.xul
   </popupset>
-#include editContactPanel.inc
+#include editContactPanel.inc.xul
 
 #ifdef XP_MACOSX
   <vbox id="titlebar">
     <hbox id="titlebar-content">
       <spacer id="titlebar-spacer" flex="1"/>
       <hbox id="titlebar-buttonbox-container" align="start">
         <hbox id="titlebar-buttonbox">
           <toolbarbutton class="titlebar-button" id="titlebar-min" oncommand="window.minimize();"/>
@@ -178,57 +178,57 @@
         </hbox>
       </hbox>
       <hbox id="titlebar-fullscreen-button"/>
     </hbox>
   </vbox>
 #endif
 
   <!-- navigation-toolbox with the main menubar -->
-#include mainNavigationToolbox.inc
+#include mainNavigationToolbox.inc.xul
   </toolbox>
 
   <!-- mail-toolbox with the main toolbarbuttons -->
-#include mainMailToolbox.inc
+#include mainMailToolbox.inc.xul
 
   <tooltip id="aHTMLTooltip" page="true"/>
 
   <!-- msg header view -->
   <!-- a convenience box for ease of extension overlaying -->
   <hbox id="messagepaneboxwrapper" flex="1">
     <vbox id="messagepanebox" flex="3"
           ondragover="nsDragAndDrop.dragOver(event, messagepaneObserver);"
           ondrop="nsDragAndDrop.drop(event, messagepaneObserver);"
           ondragexit="nsDragAndDrop.dragExit(event, messagepaneObserver);">
 
       <hbox id="msgHeaderView" collapsed="true" class="main-header-area">
-#include msgHdrView.inc
+#include msgHdrView.inc.xul
       </hbox>
       <!-- The msgNotificationBar appears on top of the message and displays
            information like: junk, mdn, remote content and phishing warnings -->
       <notificationbox id="msgNotificationBar" notificationside="top"/>
 
       <!-- message view -->
       <browser id="messagepane" context="mailContext" tooltip="aHTMLTooltip"
                style="height: 0px; min-height: 1px" flex="1" name="messagepane"
                disablesecurity="true" disablehistory="true" type="content" primary="true"
                onresize="return messagePaneOnResize(event);" autofind="false"
                src="about:blank" onclick="return contentAreaClick(event);" />
       <splitter id="attachment-splitter" collapse="after" resizebefore="closest" resizeafter="closest" collapsed="true"/>
       <vbox id="attachmentView" collapsed="true">
-#include msgAttachmentView.inc
+#include msgAttachmentView.inc.xul
       </vbox>
       <findbar id="FindToolbar" browserid="messagepane"/>
     </vbox>
   </hbox>
   <panel id="customizeToolbarSheetPopup" noautohide="true">
     <iframe id="customizeToolbarSheetIFrame"
             style="&dialog.dimensions;"
             hidden="true"/>
   </panel>
 
   <hbox id="status-bar" class="statusbar chromeclass-status">
-#include mainStatusbar.inc
+#include mainStatusbar.inc.xul
     <hbox class="statusbarpanel statusbar-resizerpanel">
       <resizer dir="bottomend"/>
     </hbox>
   </hbox>
 </window>
--- a/mail/base/content/messenger.xul
+++ b/mail/base/content/messenger.xul
@@ -150,17 +150,17 @@
 <script type="application/javascript" src="chrome://messenger/content/macMessengerMenu.js"/>
 <script type="application/javascript" src="chrome://global/content/macWindowMenu.js"/>
 #endif
 
 <!-- move needed functions into a single js file -->
 <script type="application/javascript" src="chrome://messenger/content/threadPane.js"/>
 
 <commandset id="mailCommands">
-#include mainCommandSet.inc
+#include mainCommandSet.inc.xul
   <commandset id="mailSearchMenuItems"/>
   <commandset id="globalEditMenuItems"
               commandupdater="true"
               events="create-menu-edit"
               oncommandupdate="goUpdateGlobalEditMenuItems()"/>
   <commandset id="selectEditMenuItems"
               commandupdater="true"
               events="create-menu-edit"
@@ -195,17 +195,17 @@
   <commandset id="tasksCommands">
     <command id="cmd_newMessage" oncommand="goOpenNewMessage();"/>
     <command id="cmd_newCard" oncommand="openNewCardDialog()"/>
   </commandset>
   <command id="cmd_close" oncommand="CloseTabOrWindow();"/>
 </commandset>
 
 <keyset id="mailKeys">
-#include mainKeySet.inc
+#include mainKeySet.inc.xul
   <keyset id="tasksKeys">
 #ifdef XP_MACOSX
     <key id="key_newMessage" key="&newMessageCmd.key;" command="cmd_newMessage"
          modifiers="accel,shift"/>
     <key id="key_newMessage2" key="&newMessageCmd2.key;" command="cmd_newMessage"
          modifiers="accel"/>
 #else
     <key id="key_newMessage"  key="&newMessageCmd.key;" command="cmd_newMessage"
@@ -213,18 +213,18 @@
     <key id="key_newMessage2" key="&newMessageCmd2.key;" command="cmd_newMessage"
          modifiers="accel"/>
 #endif
   </keyset>
 </keyset>
 
 <!-- Popup menus provided by mailWindowOverlay.xul -->
 <popupset id="mainPopupSet">
-#include mainPopupSet.inc
-#include msgHdrPopup.inc
+#include mainPopupSet.inc.xul
+#include msgHdrPopup.inc.xul
   <panel type="glodacomplete-richlistbox"
          id="PopupGlodaAutocomplete"
          noautofocus="true" />
   <panel type="autocomplete"
          id="PopupAutoComplete"
          noautofocus="true"/>
 
   <tooltip id="attachmentListTooltip"/>
@@ -327,18 +327,18 @@
   </popupnotification>
 
   <popupnotification id="addon-installed-notification" hidden="true">
     <popupnotificationcontent class="addon-installed-notification-content" orient="vertical">
       <description id="addon-installed-restart-text" class="addon-installed-restart-text"/>
     </popupnotificationcontent>
   </popupnotification>
 
-#include editContactPanel.inc
-#include ../../components/im/content/chat-menu.inc
+#include editContactPanel.inc.xul
+#include ../../components/im/content/chat-menu.inc.xul
 </popupset>
 #ifdef XP_MACOSX
 <popupset>
   <menupopup id="menu_mac_dockmenu">
     <menuitem label="&writeNewMessageDock.label;" id="tasksWriteNewMessage"
               oncommand="writeNewMessageDock();"/>
     <menuitem label="&openAddressBookDock.label;" id="tasksOpenAddressBook"
               oncommand="openAddressBookDock();"/>
@@ -360,17 +360,17 @@
     </hbox>
 #ifdef XP_MACOSX
     <hbox id="titlebar-fullscreen-button"/>
 #endif
   </hbox>
 </vbox>
 
   <!-- navigation-toolbox with main menubar and tabs toolbar -->
-#include mainNavigationToolbox.inc
+#include mainNavigationToolbox.inc.xul
 
     <toolbar id="tabs-toolbar" class="chromeclass-toolbar">
       <!-- class tabmail-tabs is unused and only maintained for add-ons. -->
       <tabs flex="1"
             id="tabmail-tabs"
             align="end"
             setfocus="false"
             onclick="document.getElementById('tabmail').onTabClick(event);"
@@ -442,17 +442,17 @@
         <!-- mailContent is the container used for the "wide" layout. Normally,
              all it contains is the "messengerBox" box.  However, in "wide" mode
              the message pane and its splitter transplant themselves into the box
              (respectively, messagepanebox and threadpane-splitter).  This gives us
              the folder pane next to the thread view, with the message pane/reader
              beneath both of them. -->
         <box id="mailContent" orient="vertical" flex="1">
           <!-- mail-toolbox with the main toolbarbuttons -->
-#include mainMailToolbox.inc
+#include mainMailToolbox.inc.xul
 
           <box id="messengerBox" orient="horizontal" flex="1" minheight="100" height="100" persist="height">
             <vbox id="folderPaneBox" minwidth="125" width="200" persist="width">
               <sidebarheader id="folderPaneHeader" hidden="true" align="center"/>
               <toolbar id="folderPane-toolbar"
                        class="inline-toolbar"
                        toolboxid="mail-toolbox"
                        toolbarname="&folderPaneBar.label;"
@@ -516,17 +516,17 @@
                               onunderflow="document.getElementById('folderPaneHeader').setAttribute('overflowing', 'false');"/>
               </tree>
             </vbox>
 
             <splitter id="folderpane_splitter" collapse="before"/>
 
             <vbox flex="1">
               <box orient="vertical" id="messagesBox" flex="1">
-#include quickFilterBar.inc
+#include quickFilterBar.inc.xul
                 <deck id="displayDeck" flex="1" selectedIndex="0"
                       minheight="100" height="100" persist="height"
                       >
                   <!-- first panel in displayDeck is Account Central -->
                   <vbox id="accountCentralBox" flex="1">
                     <iframe name="accountCentralPane"
                             contextmenu="pageContextMenu"
                             tooltip="aHTMLTooltip"
@@ -657,17 +657,17 @@
                              flex="1" name="multimessage"
                              hidden="true"
                              disablesecurity="true" disablehistory="true"
                              tooltip="aHTMLTooltip"
                              src="chrome://messenger/content/multimessageview.xhtml"
                              autofind="false"/>
                     <vbox id="singlemessage" flex="1">
                       <hbox id="msgHeaderView" collapsed="true" class="main-header-area">
-#include msgHdrView.inc
+#include msgHdrView.inc.xul
                       </hbox>
                       <!-- The msgNotificationBar appears on top of the message
                            and displays information like: junk, contains remote
                            images, or is a suspected phishing URL. -->
                       <notificationbox id="msgNotificationBar" notificationside="top"/>
                       <!-- The messagepanewrapper hbox exists to allow
                            extensions to add sidebars to the message. -->
                       <hbox id="messagepanewrapper" flex="1">
@@ -679,28 +679,28 @@
                                  onresize="return messagePaneOnResize(event);"
                                  disablesecurity="true"
                                  onclick="return contentAreaClick(event);"/>
                       </hbox>
                       <splitter id="attachment-splitter" collapse="after"
                                 resizebefore="closest" resizeafter="closest"
                                 collapsed="true"/>
                       <vbox id="attachmentView" collapsed="true">
-#include msgAttachmentView.inc
+#include msgAttachmentView.inc.xul
                       </vbox>
                       <findbar id="FindToolbar" browserid="messagepane"/>
                     </vbox>
                   </vbox>
                 </hbox>
                <notificationbox id="msg-footer-notification-box" notificationside="bottom"/>
               </box>
             </vbox>
           </box>
         </box> <!-- end of mailContent -->
-#include ../../components/im/content/chat-messenger.inc
+#include ../../components/im/content/chat-messenger.inc.xul
       </tabpanels>
      </tabbox>
     </tabmail>
     <vbox id="contentTab" collapsed="true">
       <vbox flex="1" class="contentTabInstance">
         <toolbox id="dummycontenttoolbox" class="contentTabToolbox">
           <toolbar id="dummycontenttoolbar" class="contentTabToolbar">
             <toolbarspacer/>
@@ -780,15 +780,15 @@
     <iframe id="customizeToolbarSheetIFrame"
             style="&dialog.dimensions;"
             hidden="true"/>
   </panel>
 
   <notificationbox id="mail-notification-box" notificationside="bottom"/>
   <statuspanel id="statusbar-display"/>
   <hbox id="status-bar" class="statusbar chromeclass-status">
-#include mainStatusbar.inc
+#include mainStatusbar.inc.xul
     <statusbarpanel id="unreadMessageCount"/>
     <statusbarpanel id="totalMessageCount"/>
   </hbox>
 
 </window>
 
rename from mail/base/content/msgAttachmentView.inc
rename to mail/base/content/msgAttachmentView.inc.xul
rename from mail/base/content/msgHdrPopup.inc
rename to mail/base/content/msgHdrPopup.inc.xul
rename from mail/base/content/msgHdrView.inc
rename to mail/base/content/msgHdrView.inc.xul
rename from mail/base/content/quickFilterBar.inc
rename to mail/base/content/quickFilterBar.inc.xul
rename from mail/components/addrbook/content/abCard.inc
rename to mail/components/addrbook/content/abCard.inc.xul
--- a/mail/components/addrbook/content/abEditCardDialog.xul
+++ b/mail/components/addrbook/content/abEditCardDialog.xul
@@ -19,11 +19,11 @@
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
   </stringbundleset>
 
   <script type="application/javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
   <script type="application/javascript" src="chrome://messenger/content/addressbook/abCard.js"/>
 
-#include abCard.inc
+#include abCard.inc.xul
 
 </dialog>
--- a/mail/components/addrbook/content/abNewCardDialog.xul
+++ b/mail/components/addrbook/content/abNewCardDialog.xul
@@ -33,11 +33,11 @@
     <label id="abPopupLabel" control="abPopup" value="&chooseAddressBook.label;" accesskey="&chooseAddressBook.accesskey;"/>
     <menulist id="abPopup">
       <menupopup id="abPopup-menupopup" class="addrbooksPopup" writable="true"/>
     </menulist>
   </hbox>
 
   <spacer style="height:1em"/>
 
-#include abCard.inc
+#include abCard.inc.xul
 
 </dialog>
--- a/mail/components/addrbook/content/addressbook.xul
+++ b/mail/components/addrbook/content/addressbook.xul
@@ -601,21 +601,21 @@
                       accesskey="&preferencesCmd2.accesskey;"
                       command="cmd_preferences"/>
 #endif
 #endif
           </menupopup>
         </menu>
 
 #ifdef XP_MACOSX
-#include ../../../base/content/macWindowMenu.inc
+#include ../../../base/content/macWindowMenu.inc.xul
 #endif
 
       <!-- Help -->
-#include ../../../base/content/helpMenu.inc
+#include ../../../base/content/helpMenu.inc.xul
     </menubar>
    </toolbaritem>
   </toolbar>
 
   <toolbarpalette id="AddressBookToolbarPalette">
       <toolbarbutton class="toolbarbutton-1" id="button-newcard"
                      label="&newContactButton.label;" command="cmd_newCard"
                      tooltiptext="&newContactButton.tooltip;"/>
rename from mail/components/compose/content/editFormatButtons.inc
rename to mail/components/compose/content/editFormatButtons.inc.xul
--- a/mail/components/compose/content/messengercompose.xul
+++ b/mail/components/compose/content/messengercompose.xul
@@ -1693,21 +1693,21 @@
             <menuitem id="menu_preferences" label="&preferencesCmd2.label;" accesskey="&preferencesCmd2.accesskey;"
                       oncommand="openOptionsDialog('paneCompose');"/>
 #endif
 #endif
          </menupopup>
       </menu>
 
 #ifdef XP_MACOSX
-#include ../../../base/content/macWindowMenu.inc
+#include ../../../base/content/macWindowMenu.inc.xul
 #endif
 
       <!-- Help -->
-#include ../../../base/content/helpMenu.inc
+#include ../../../base/content/helpMenu.inc.xul
     </menubar>
    </toolbaritem>
   </toolbar>
 
   <toolbarpalette id="MsgComposeToolbarPalette">
 
     <toolbarbutton class="toolbarbutton-1"
                id="button-send" label="&sendButton.label;"
@@ -2035,17 +2035,17 @@
               tooltiptext=""
               onclick="goDoCommand('cmd_toggleAttachmentPane')"/>
       </hbox>
     </toolbar>
 
     <toolbox id="FormatToolbox" mode="icons">
       <toolbar class="chromeclass-toolbar" id="FormatToolbar" persist="collapsed"
                customizable="true" nowindowdrag="true">
-#include editFormatButtons.inc
+#include editFormatButtons.inc.xul
         <spacer flex="1"/>
       </toolbar>
     </toolbox>
   </toolbox>
 
   <splitter id="compose-toolbar-sizer" onmousedown="awSizerListen()"/>
 
   <!-- The mail message body frame -->
rename from mail/components/im/content/chat-menu.inc
rename to mail/components/im/content/chat-menu.inc.xul
rename from mail/components/im/content/chat-messenger.inc
rename to mail/components/im/content/chat-messenger.inc.xul
--- a/mail/components/preferences/aboutPreferences.xul
+++ b/mail/components/preferences/aboutPreferences.xul
@@ -8,17 +8,17 @@
 <?xml-stylesheet href="chrome://messenger/content/messenger.css"?>
 <?xml-stylesheet href="chrome://messenger/content/preferences/handlers.css"?>
 <?xml-stylesheet href="chrome://messenger/skin/filefield.css"?>
 <?xml-stylesheet href="chrome://messenger/skin/preferences/applications.css"?>
 <?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
 <?xml-stylesheet href="chrome://global/skin/in-content/common.css"?>
 <?xml-stylesheet href="chrome://messenger/skin/preferences/aboutPreferences.css"?>
 
-#include doctype.inc
+#include doctype.inc.xul
 
 <preftab id="MailPreferences" flex="1"
          windowtype="Mail:Preferences"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
          xmlns:xhtml="http://www.w3.org/1999/xhtml"
          xmlns:html="http://www.w3.org/1999/xhtml"
          onload="gSubDialog.init();"
 #ifdef XP_WIN
rename from mail/components/preferences/doctype.inc
rename to mail/components/preferences/doctype.inc.xul
--- a/mail/extensions/mailviews/content/mailViewSetup.xul
+++ b/mail/extensions/mailviews/content/mailViewSetup.xul
@@ -45,13 +45,13 @@
          <textbox tabindex="0" id="name" oninput="doEnabling();"/>
       </hbox>
     </vbox>
 
     <separator/>
     <label value="&searchTermCaption.label;"/>
     <hbox flex="1">
       <vbox id="searchTermListBox" flex="1">
-#include ../../../../mailnews/base/search/content/searchTerm.inc
+#include ../../../../mailnews/base/search/content/searchTerm.inc.xul
     </hbox>
   </vbox>
 
 </dialog>
--- a/mailnews/base/content/virtualFolderProperties.xul
+++ b/mailnews/base/content/virtualFolderProperties.xul
@@ -99,14 +99,14 @@
   </hbox>
 
   <separator class="thin"/>
 
   <vbox flex="2">
     <label value="&searchTermCaption.label;"/>
     <hbox flex="1">
       <vbox id="searchTermListBox" flex="2">
-#include ../search/content/searchTerm.inc
+#include ../search/content/searchTerm.inc.xul
     </hbox>
   </vbox>
 
 </dialog>
 
rename from mailnews/base/prefs/content/am-addressing.inc
rename to mailnews/base/prefs/content/am-addressing.inc.xul
--- a/mailnews/base/prefs/content/am-addressing.xul
+++ b/mailnews/base/prefs/content/am-addressing.xul
@@ -17,11 +17,11 @@
   <vbox flex="1" style="overflow: auto;">
     <script type="application/javascript" src="chrome://messenger/content/am-addressing.js"/>
     <script type="application/javascript" src="chrome://messenger/content/amUtils.js"/>
     <script type="application/javascript" src="chrome://messenger/content/am-prefs.js"/>
 
     <hbox class="dialogheader">
       <label class="dialogheader-title" value="&addressing.label;"/>
     </hbox>
-#include am-addressing.inc
+#include am-addressing.inc.xul
   </vbox>
 </page>
rename from mailnews/base/prefs/content/am-copies.inc
rename to mailnews/base/prefs/content/am-copies.inc.xul
--- a/mailnews/base/prefs/content/am-copies.xul
+++ b/mailnews/base/prefs/content/am-copies.xul
@@ -16,11 +16,11 @@
   <vbox flex="1" style="overflow: auto;">
     <script type="application/javascript" src="chrome://messenger/content/AccountManager.js"/>
     <script type="application/javascript" src="chrome://messenger/content/am-copies.js"/>
     <script type="application/javascript" src="chrome://messenger/content/amUtils.js"/>
 
     <hbox class="dialogheader">
       <label class="dialogheader-title" value="&copyAndFolderTitle.label;"/>
     </hbox>
-#include am-copies.inc
+#include am-copies.inc.xul
   </vbox>
 </page>
--- a/mailnews/base/prefs/content/am-identity-edit.xul
+++ b/mailnews/base/prefs/content/am-identity-edit.xul
@@ -162,19 +162,19 @@
             <textbox id="identity.label" flex="1"/>
           </hbox>
         </groupbox>
 
         <spacer flex="1"/>
       </vbox>
 
       <!-- Copies & Folders Tab -->
-#include am-copies.inc
+#include am-copies.inc.xul
 
       <!-- Composition & Addressing Tab -->
-#include am-addressing.inc
+#include am-addressing.inc.xul
 
       <!-- Security Tab -->
-#include ../../../extensions/smime/content/am-smime.inc
+#include ../../../extensions/smime/content/am-smime.inc.xul
 
     </tabpanels>
   </tabbox>
 </dialog>
--- a/mailnews/base/search/content/FilterEditor.xul
+++ b/mailnews/base/search/content/FilterEditor.xul
@@ -104,17 +104,17 @@
                       accesskey="&contextOutgoing.accesskey;"
                       command="cmd_updateFilterType"/>
           </row>
         </rows>
       </grid>
     </groupbox>
 
     <vbox id="searchTermListBox" flex="1">
-#include searchTerm.inc
+#include searchTerm.inc.xul
   </vbox>
 
   <splitter id="gray_horizontal_splitter" persist="state" orient="vertical"/>
 
   <vbox flex="1">
     <label value="&filterActionDesc.label;"
            accesskey="&filterActionDesc.accesskey;"
            control="filterActionList"/>
rename from mailnews/base/search/content/searchTerm.inc
rename to mailnews/base/search/content/searchTerm.inc.xul
rename from mailnews/extensions/smime/content/am-smime.inc
rename to mailnews/extensions/smime/content/am-smime.inc.xul
--- a/mailnews/extensions/smime/content/am-smime.xul
+++ b/mailnews/extensions/smime/content/am-smime.xul
@@ -15,12 +15,12 @@
   <vbox flex="1" style="overflow: auto;">
     <script type="application/javascript" src="chrome://messenger/content/AccountManager.js"/>
     <script type="application/javascript" src="chrome://messenger/content/am-smime.js"/>
 
     <hbox class="dialogheader">
       <label class="dialogheader-title" value="&securityTitle.label;"/>
     </hbox>
 
-#include am-smime.inc
+#include am-smime.inc.xul
   </vbox>
 
 </page>