Bug 1257160 - Hide the Update tab completely when ac_add_options --disable-updater is set. r=mkmelin a=jorgk
authorRichard Marti <richard.marti@gmail.com>
Sun, 03 Apr 2016 21:41:15 +0200
changeset 26980 43c1462bfc4da9c1ab59f39814152da4481d84e0
parent 26979 c66fadeb47f65eda25c9c809e771ee3a3986b4f0
child 26981 0779f555eb353639bca45751f0b82b434babda5c
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmkmelin, jorgk
bugs1257160
Bug 1257160 - Hide the Update tab completely when ac_add_options --disable-updater is set. r=mkmelin a=jorgk
mail/components/preferences/advanced.xul
--- a/mail/components/preferences/advanced.xul
+++ b/mail/components/preferences/advanced.xul
@@ -86,18 +86,18 @@
 
       <!-- Network tab -->
       <preference id="mail.prompt_purge_threshhold"
                   name="mail.prompt_purge_threshhold" type="bool"/>
       <preference id="mail.purge_threshhold_mb"
                   name="mail.purge_threshhold_mb" type="int"/>
       <preference id="browser.cache.disk.capacity"
                   name="browser.cache.disk.capacity" type="int"/>
+#ifdef MOZ_UPDATER
       <!-- Update tab -->
-#ifdef MOZ_UPDATER
       <preference id="app.update.enabled" name="app.update.enabled"
 type="bool"/>
       <preference id="app.update.auto" name="app.update.auto"
 type="bool"/>
       <preference id="app.update.mode" name="app.update.mode"
 type="int"/>
       <preference id="app.update.disable_button.showUpdateHistory"
                   name="app.update.disable_button.showUpdateHistory"
@@ -136,17 +136,19 @@ type="int"/>
 
     <tabbox id="advancedPrefs" flex="1" onselect="gAdvancedPane.tabSelectionChanged();">
       <tabs id="advancedPrefsTabs">
         <tab id="generalTab" label="&itemGeneral.label;"/>
 #ifdef MOZ_DATA_REPORTING
         <tab id="dataChoicesTab" label="&dataChoicesTab.label;"/>
 #endif
         <tab id="networkingTab" label="&itemNetworking.label;"/>
+#ifdef MOZ_UPDATER
         <tab id="updateTab" label="&itemUpdate.label;"/>
+#endif
         <tab id="certificateTab" label="&itemCertificates.label;"/>
       </tabs>
 
       <tabpanels id="advancedPrefsPanels" flex="1">
         <!-- General -->
         <tabpanel orient="vertical">
           <hbox align="center">
             <description flex="1">&returnReceiptsInfo.label;</description>
@@ -328,20 +330,19 @@ type="int"/>
                          type="number" min="1" max="2048" increment="10"
                          preference="mail.purge_threshhold_mb"
                          aria-labelledby="offlineCompactFolder offlineCompactFolderMin compactFolderMB"/>
                 <label id="compactFolderMB" value="&offlineCompactFoldersMB.label;"/>
             </hbox>
           </groupbox>
         </tabpanel>
 
+#ifdef MOZ_UPDATER
         <!-- Update -->
-
         <tabpanel orient="vertical" align="start">
-#ifdef MOZ_UPDATER
           <groupbox id="updateApp">
             <caption label="&updateApp.label;"/>
             <radiogroup id="updateRadioGroup"
                         oncommand="gAdvancedPane.updateWritePrefs();">
               <radio value="auto"
                      label="&updateAuto.label;"
                      accesskey="&updateAuto.accesskey;"/>
               <hbox class="indent">
@@ -377,18 +378,18 @@ type="int"/>
 
 #ifdef MOZ_MAINTENANCE_SERVICE
           <separator/>
           <checkbox id="useService"
                     label="&useService.label;"
                     accesskey="&useService.accesskey;"
                     preference="app.update.service.enabled"/>
 #endif
+        </tabpanel>
 #endif
-        </tabpanel>
 
         <!-- Certificates -->
         <tabpanel orient="vertical">
           <description id="CertSelectionDesc" control="certSelection">&certSelection.description;</description>
 
           <!--
             The values on these radio buttons may look like l12y issues, but
             they're not - this preference uses *those strings* as its values.