From df066b5e0246a3749956214421eac104ee7e0104 Mon Sep 17 00:00:00 2001
From: "jaggernaut%netscape.com" <jaggernaut%netscape.com>
Date: Wed, 17 May 2006 02:31:25 +0000
Subject: [PATCH] Bug 99876: [XUL Syntax] <spring/> --> <spacer/>, r=alecf,
 sr=hyatt.

---
 suite/common/pref/pref-charset.xul        | 4 ++--
 suite/common/pref/pref-colors.xul         | 8 ++++----
 suite/common/pref/pref-download.xul       | 2 +-
 suite/common/pref/pref-fonts.xul          | 8 ++++----
 suite/common/pref/pref-history.xul        | 4 ++--
 suite/common/pref/pref-languages.xul      | 2 +-
 suite/common/pref/pref-policies.xul       | 2 +-
 suite/common/pref/pref-smart_browsing.xul | 4 ++--
 suite/common/pref/pref-smartupdate.xul    | 6 +++---
 suite/common/pref/pref-winhooks.xul       | 2 +-
 10 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/suite/common/pref/pref-charset.xul b/suite/common/pref/pref-charset.xul
index e40568a15cbd..316fcb4ef1e2 100644
--- a/suite/common/pref/pref-charset.xul
+++ b/suite/common/pref/pref-charset.xul
@@ -83,12 +83,12 @@
       </hbox>
     </vbox> 
     <vbox>
-      <spring flex="1"/>
+      <spacer flex="1"/>
       <button id="up_button" class="up small" disabled="true"
               oncommand="MoveUp();"/>
       <button id="down_button" class="down small" disabled="true"
               oncommand="MoveDown();"/>
-      <spring flex="1"/>
+      <spacer flex="1"/>
     </vbox>
   </hbox>
 
diff --git a/suite/common/pref/pref-colors.xul b/suite/common/pref/pref-colors.xul
index b1d3ad733211..900eeb0691bf 100644
--- a/suite/common/pref/pref-colors.xul
+++ b/suite/common/pref/pref-colors.xul
@@ -49,13 +49,13 @@
       <caption label="&color;"/>
       <hbox>
         <text class="label" value="&textColor.label;" accesskey="&textColor.accesskey;" for="foregroundtextmenu"/>
-        <spring flex="1"/>
+        <spacer flex="1"/>
         <colorpicker type="button" id="foregroundtextmenu" palettename="standard" onchange="setColorWell(this)"/> 
         <data id="foregroundText" pref="true" preftype="color" prefstring="browser.display.foreground_color" prefattribute="value" wsm_attributes="value"/>
       </hbox>
       <hbox style="margin-top: 5px">
         <text class="label" value="&backgroundColor.label;" accesskey="&backgroundColor.accesskey;" for="backgroundmenu"/>
-        <spring flex="1"/>
+        <spacer flex="1"/>
         <colorpicker type="button" id="backgroundmenu" palettename="standard" onchange="setColorWell(this)"/> 
         <data id="background" pref="true" preftype="color" prefstring="browser.display.background_color" prefattribute="value" wsm_attributes="value"/>
       </hbox>
@@ -70,13 +70,13 @@
       <caption label="&links;"/>
       <hbox>
         <text class="label" value="&linkColor.label;" accesskey="&linkColor.accesskey;" for="unvisitedlinkmenu"/>
-        <spring flex="1"/>
+        <spacer flex="1"/>
         <colorpicker type="button" id="unvisitedlinkmenu" palettename="standard" onchange="setColorWell(this)"/> 
         <data id="unvisitedLinks" pref="true" preftype="string" prefstring="browser.anchor_color" prefattribute="value" wsm_attributes="value"/>
       </hbox>
       <hbox style="margin-top: 5px">
         <text class="label" value="&visitedLinkColor.label;" accesskey="&visitedLinkColor.accesskey;" for="visitedlinkmenu"/>
-        <spring flex="1"/>
+        <spacer flex="1"/>
         <colorpicker type="button" id="visitedlinkmenu" palettename="standard" onchange="setColorWell(this)"/> 
         <data id="visitedLinks" pref="true" preftype="string" prefstring="browser.visited_color" prefattribute="value" wsm_attributes="value"/>
       </hbox>
diff --git a/suite/common/pref/pref-download.xul b/suite/common/pref/pref-download.xul
index 7c6aec3f0b60..b31bf6de9e11 100644
--- a/suite/common/pref/pref-download.xul
+++ b/suite/common/pref/pref-download.xul
@@ -137,7 +137,7 @@
         <button class="dialog push" label="&select;" align="left"/>
       </html:div>
     </vbox>
-    <spring style="height: 30px;"/>
+    <spacer style="height: 30px;"/>
   </html:fieldset>
 
 </window>
diff --git a/suite/common/pref/pref-fonts.xul b/suite/common/pref/pref-fonts.xul
index 4c8bc02ba949..c87741b7843d 100644
--- a/suite/common/pref/pref-fonts.xul
+++ b/suite/common/pref/pref-fonts.xul
@@ -151,7 +151,7 @@
           <menulist id="serif" class="small-margin" flex="1" style="width: 0px;">
             <menupopup/>
           </menulist>
-          <spring/>
+          <spacer/>
         </row>
         <row align="center">
           <hbox align="center" pack="end">
@@ -163,7 +163,7 @@
           <menulist id="sans-serif" class="small-margin" flex="1" style="width: 0px;">
             <menupopup/>
           </menulist>
-          <spring/>
+          <spacer/>
         </row>
         <row align="center">
           <hbox align="center" pack="end">
@@ -175,7 +175,7 @@
           <menulist id="cursive" class="small-margin">
             <menupopup/>
           </menulist>
-          <spring/>
+          <spacer/>
         </row>
         <row align="center">
           <hbox align="center" pack="end">
@@ -187,7 +187,7 @@
           <menulist id="fantasy" class="small-margin">
             <menupopup/>
           </menulist>
-          <spring/>
+          <spacer/>
         </row>
         <row align="center">
           <hbox align="center" pack="end">
diff --git a/suite/common/pref/pref-history.xul b/suite/common/pref/pref-history.xul
index b64386946e3b..748115d3b8de 100644
--- a/suite/common/pref/pref-history.xul
+++ b/suite/common/pref/pref-history.xul
@@ -113,7 +113,7 @@
                  pref="true" preftype="int" prefstring="browser.history_expire_days"
                  prefattribute="value"/>
       <text class="label" value="&days.label;"/>
-      <spring flex="1"/>
+      <spacer flex="1"/>
       <button class="dialog" label="&clearHistory.label;" accesskey="&clearHistory.accesskey;"
         oncommand="prefClearGlobalHistory();"
         id="browserClearHistory" pref="true" preftype="bool"
@@ -145,7 +145,7 @@
       <textbox id="shistMax" size="3" wsm_persist="true"
                   pref="true" preftype="int" prefstring="browser.sessionhistory.max_entries"
                   prefattribute="value"/>      
-      <spring flex="1"/>
+      <spacer flex="1"/>
     </hbox>
   </groupbox>  
 
diff --git a/suite/common/pref/pref-languages.xul b/suite/common/pref/pref-languages.xul
index 7c0459e32efe..924574c92984 100644
--- a/suite/common/pref/pref-languages.xul
+++ b/suite/common/pref/pref-languages.xul
@@ -75,7 +75,7 @@
                 accesskey="&languages.customize.moveDown.accesskey;"
                 pref="true" preftype="bool"
                 prefstring="pref.browser.language.disable_button.down" prefattribute="disabled"/>
-        <spring flex="1"/>
+        <spacer flex="1"/>
         <button class="dialog" id="add"
                 label="&languages.customize.addButton.label;"
                 oncommand="AddLanguage();"
diff --git a/suite/common/pref/pref-policies.xul b/suite/common/pref/pref-policies.xul
index 414a9cd7d4da..27965522a92c 100644
--- a/suite/common/pref/pref-policies.xul
+++ b/suite/common/pref/pref-policies.xul
@@ -71,7 +71,7 @@
       <vbox>
         <button class="dialog" label="&addSite.label;" accesskey="&addSite.accesskey;"
                 oncommand="addSite();"/>
-        <spring flex="1"/>              
+        <spacer flex="1"/>              
       </vbox>    
     </hbox>
     
diff --git a/suite/common/pref/pref-smart_browsing.xul b/suite/common/pref/pref-smart_browsing.xul
index 8540f7145821..06a6c65a19b3 100644
--- a/suite/common/pref/pref-smart_browsing.xul
+++ b/suite/common/pref/pref-smart_browsing.xul
@@ -110,7 +110,7 @@
       <checkbox class="small-margin" id="browserGoBrowsingEnabled" label="&keywordsEnabled.label;" accesskey="&keywordsEnabled.accesskey;"
                 pref="true" preftype="bool" prefstring="keyword.enabled"
                 prefattribute="checked"/>
-      <spring flex="1"/>
+      <spacer flex="1"/>
       <button class="small-margin" label="&moreInformation.label;" accesskey="&moreInformation.accesskey;" oncommand="moreInfo();"
         id="moreInformationButton" pref="true" preftype="bool"
         prefstring="pref.browser.smartbrowsing.disable_button.more_info" prefattribute="disabled"/>
@@ -125,7 +125,7 @@
         <checkbox class="small-margin" id="browserAutoCompleteEnabled" label="&autoCompleteEnabled.label;" accesskey="&autoCompleteEnabled.accesskey;"
                   pref="true" preftype="bool" prefstring="browser.urlbar.autocomplete.enabled"
                   prefattribute="checked"/>
-      <spring flex="1"/>
+      <spacer flex="1"/>
       <button label="&autoCompleteAdvanced.label;" oncommand="showACAdvanced()"/>
       <data id="browserUrlbarAutoFill" pref="true" preftype="bool" prefattribute="value"
             prefstring="browser.urlbar.autoFill"/>"
diff --git a/suite/common/pref/pref-smartupdate.xul b/suite/common/pref/pref-smartupdate.xul
index afb5362f6096..f7bcce11ad7f 100644
--- a/suite/common/pref/pref-smartupdate.xul
+++ b/suite/common/pref/pref-smartupdate.xul
@@ -63,13 +63,13 @@
           </treeitem>
         </treechildren>
       </tree>
-      <spring flex="5%"/>
+      <spacer flex="5%"/>
       <vbox>
         <button class="dialog push" id="pref:0:bool:smartupdate" label="&uninstallButton.label;" accesskey="&uninstallButton.accesskey;"/>
-        <spring flex="100%"/>
+        <spacer flex="100%"/>
       </vbox>
     </hbox>
-    <spring style="height: 28px;"/>
+    <spacer style="height: 28px;"/>
   </html:fieldset>
 -->
 </window>
diff --git a/suite/common/pref/pref-winhooks.xul b/suite/common/pref/pref-winhooks.xul
index bdfe8fad20d1..18161f5080f3 100644
--- a/suite/common/pref/pref-winhooks.xul
+++ b/suite/common/pref/pref-winhooks.xul
@@ -143,7 +143,7 @@
     <hbox align="center">
         <checkbox id="showDialog" label="&showDialog.label;" accesskey="&showDialog.accesskey;"/>     
     </hbox>
-    <spring flex="1"/>
+    <spacer flex="1"/>
     
 </window>