Bug 1545263 - Adjust usage of the menu-iconic binding which was removed in bug 1519502. r=darktrojan

editor/ui/composer/content/editingOverlay.xul

@@ -73,7 +73,7 @@
   <!-- File menu items -->
   <menu id="menu_File">
     <menupopup id="menu_FilePopup" onpopupshowing="EditorInitFileMenu();">
-      <menu id="menu_New">
+      <menu id="menu_New" class="menu-iconic">
         <menupopup id="menu_NewPopup">
           <menuitem id="menu_newEditor"/>
           <menuseparator id="sep_NewPopup"/>

mail/base/content/mainNavigationToolbox.inc.xul

@@ -39,7 +39,7 @@
               label="&fileMenu.label;"
               accesskey="&fileMenu.accesskey;">
           <menupopup id="menu_FilePopup" onpopupshowing="file_init();">
-          <menu id="menu_New"
+          <menu id="menu_New" class="menu-iconic"
                 label="&newMenu.label;"
                 accesskey="&newMenu.accesskey;">
             <menupopup id="menu_NewPopup" onpopupshowing="menu_new_init();">
@@ -94,7 +94,8 @@
                     accesskey="&closeCmd.accesskey;"
                     command="cmd_close"/>
           <menuseparator id="fileMenuAfterCloseSeparator"/>
-          <menu id="menu_saveAs" label="&saveAsMenu.label;" accesskey="&saveAsMenu.accesskey;">
+          <menu id="menu_saveAs" class="menu-iconic"
+                label="&saveAsMenu.label;" accesskey="&saveAsMenu.accesskey;">
             <menupopup id="menu_SavePopup">
               <menuitem id="menu_saveAsFile" label="&saveAsFileCmd.label;"
                accesskey="&saveAsFileCmd.accesskey;"
@@ -228,7 +229,8 @@
           </menupopup>
         </menu>
         <menuseparator id="editMenuAfterSelectSeparator"/>
-        <menu id="menu_find" label="&findMenu.label;" accesskey="&findMenu.accesskey;">
+        <menu id="menu_find" class="menu-iconic"
+              label="&findMenu.label;" accesskey="&findMenu.accesskey;">
           <menupopup id="menu_FindPopup">
             <menuitem id="menu_findCmd" label="&findCmd.label;" key="key_find" accesskey="&findCmd.accesskey;" command="cmd_find"/>
             <menuitem id="menu_findAgainCmd" label="&findAgainCmd.label;" key="key_findAgain" accesskey="&findAgainCmd.accesskey;" command="cmd_findAgain"/>

mail/components/addrbook/content/addressbook.xul

@@ -295,7 +295,8 @@
 #else
             <menupopup id="menu_FilePopup">
 #endif
-                <menu id="menu_New" label="&newMenu.label;" accesskey="&newMenu.accesskey;">
+                <menu id="menu_New" class="menu-iconic"
+                      label="&newMenu.label;" accesskey="&newMenu.accesskey;">
                     <menupopup id="menu_NewPopup">
                       <menuitem id="menu_newContact"
                                 label="&newContact.label;"

mail/components/compose/content/messengercompose.xul

@@ -810,7 +810,8 @@
       <menubar id="mail-menubar">
       <menu id="menu_File" label="&fileMenu.label;" accesskey="&fileMenu.accesskey;">
         <menupopup id="menu_FilePopup">
-          <menu id="menu_New" label="&newMenu.label;" accesskey="&newMenu.accesskey;">
+          <menu id="menu_New" class="menu-iconic"
+                label="&newMenu.label;" accesskey="&newMenu.accesskey;">
             <menupopup id="menu_NewPopup">
               <menuitem id="menu_NewMessage"
                         label="&newMessage.label;" accesskey="&newMessage.accesskey;"
@@ -840,7 +841,8 @@
           <menuseparator/>
           <menuitem id="menu_SaveCmd" label="&saveCmd.label;" accesskey="&saveCmd.accesskey;"
                     key="key_save" command="cmd_saveDefault"/>
-          <menu id="menu_SaveAsCmd" label="&saveAsCmd.label;" accesskey="&saveAsCmd.accesskey;">
+          <menu id="menu_SaveAsCmd" class="menu-iconic"
+                label="&saveAsCmd.label;" accesskey="&saveAsCmd.accesskey;">
             <menupopup id="menu_SaveAsCmdPopup" onpopupshowing="InitFileSaveAsMenu();">
               <menuitem id="menu_SaveAsFileCmd"
                         label="&saveAsFileCmd.label;" accesskey="&saveAsFileCmd.accesskey;"
@@ -1081,7 +1083,8 @@
       <menu id="formatMenu" label="&formatMenu.label;" accesskey="&formatMenu.accesskey;" command="cmd_renderedHTMLEnabler">
         <menupopup id="formatMenuPopup" onpopupshowing="EditorInitFormatMenu()">
           <!-- Font face submenu -->
-          <menu id="fontFaceMenu" label="&fontfaceMenu.label;" accesskey="&fontfaceMenu.accesskey;"
+          <menu id="fontFaceMenu" class="menu-iconic"
+                label="&fontfaceMenu.label;" accesskey="&fontfaceMenu.accesskey;"
                 position="1">
             <menupopup id="fontFaceMenuPopup"
                        oncommand="if (event.target.localName == 'menuitem')

mail/themes/linux/mail/addrbook/addressbook.css

@@ -104,7 +104,6 @@
 
 /** Stock icons for the menu items. */
 #menu_New {
-  -moz-binding: url("chrome://global/content/bindings/menu.xml#menu-iconic");
   list-style-image: url("moz-icon://stock/gtk-new?size=menu");
 }
 

mail/themes/linux/mail/compose/messengercompose.css

@@ -39,7 +39,6 @@
 /** Stock icons for the menu items. */
 
 #fontFaceMenu {
-  -moz-binding: url("chrome://global/content/bindings/menu.xml#menu-iconic");
   list-style-image: url("moz-icon://stock/gtk-select-font?size=menu");
 }
 
@@ -653,7 +652,6 @@ toolbarbutton.formatting-button[disabled="true"] > .toolbarbutton-icon,
 }
 
 #menu_SaveAsCmd {
-  -moz-binding: url("chrome://global/content/bindings/menu.xml#menu-iconic");
   list-style-image: url("moz-icon://stock/gtk-save-as?size=menu");
 }
 

mail/themes/linux/mail/messenger.css

@@ -549,7 +549,6 @@ menuitem:not([type]) {
 }
 
 #menu_New {
-  -moz-binding: url("chrome://global/content/bindings/menu.xml#menu-iconic");
   list-style-image: url("moz-icon://stock/gtk-new?size=menu");
 }
 
@@ -571,7 +570,6 @@ menuitem:not([type]) {
 }
 
 #menu_saveAs {
-  -moz-binding: url("chrome://global/content/bindings/menu.xml#menu-iconic");
   list-style-image: url("moz-icon://stock/gtk-save-as?size=menu");
 }
 
@@ -657,10 +655,6 @@ menuitem:not([type]) {
   list-style-image: url("moz-icon://stock/gtk-select-all?size=menu");
 }
 
-#menu_find {
-  -moz-binding: url("chrome://global/content/bindings/menu.xml#menu-iconic");
-}
-
 #menu_find {
   list-style-image: url("moz-icon://stock/gtk-find?size=menu");
 }