From 268716d0dc231507e4e62cae256ca1d9da67457a Mon Sep 17 00:00:00 2001
From: "caillon%returnzero.com" <caillon%returnzero.com>
Date: Tue, 9 Apr 2002 00:45:39 +0000
Subject: [PATCH] Backing out patch for bug 24651 until we can make initial
 button state honor preferences. a=tor

---
 modules/libpref/src/init/all.js                |  1 -
 modules/libpref/src/unix/unix.js               |  3 ---
 themes/classic/navigator/navigator.css         |  4 ----
 themes/modern/navigator/navigator.css          | 18 ------------------
 xpfe/browser/resources/content/navigator.js    |  6 ------
 xpfe/browser/resources/content/navigator.xul   |  3 ---
 .../resources/locale/en-US/navigator.dtd       |  1 -
 .../resources/content/pref-navigator.xul       |  5 +----
 .../resources/locale/en-US/pref-navigator.dtd  |  1 -
 9 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index 716660434dc..bc3accf04cb 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -105,7 +105,6 @@ pref("browser.chrome.toolbar_tips",         true);
 pref("browser.chrome.toolbar_style",        2);
 
 pref("browser.toolbars.showbutton.bookmarks", true);
-pref("browser.toolbars.showbutton.clear",   false);
 pref("browser.toolbars.showbutton.go",      false);
 pref("browser.toolbars.showbutton.home",    true);
 pref("browser.toolbars.showbutton.mynetscape", true);
diff --git a/modules/libpref/src/unix/unix.js b/modules/libpref/src/unix/unix.js
index 389ffd03372..8e9abee0e3c 100644
--- a/modules/libpref/src/unix/unix.js
+++ b/modules/libpref/src/unix/unix.js
@@ -69,9 +69,6 @@ pref("clipboard.autocopy", true);
 
 pref("browser.urlbar.clickSelectsAll", false);
 
-// clearbutton default on
-pref("browser.toolbars.showbutton.clear", true);
-
 // override double-click word selection behavior.
 pref("layout.word_select.stop_at_punctuation", false);
 
diff --git a/themes/classic/navigator/navigator.css b/themes/classic/navigator/navigator.css
index 4817a58aef7..e77b19efac0 100644
--- a/themes/classic/navigator/navigator.css
+++ b/themes/classic/navigator/navigator.css
@@ -130,10 +130,6 @@
   -moz-image-region: rect(0px 92px 21px 69px) !important;
 }
 
-#clear-button {
-  list-style-image: url("chrome://global/skin/icons/close-button.gif");
-}
-
 #fullscreen-exit-button {
   list-style-image: none;
 }
diff --git a/themes/modern/navigator/navigator.css b/themes/modern/navigator/navigator.css
index 5fa7676a2a9..399446ffe99 100644
--- a/themes/modern/navigator/navigator.css
+++ b/themes/modern/navigator/navigator.css
@@ -386,24 +386,6 @@
   height: 16px;
 }
 
-#clear-button {
-  list-style-image: url("chrome://global/skin/icons/close.gif");
-}
-
-#clear-button:hover {
-  list-style-image: url("chrome://global/skin/icons/close-hov.gif");
-  border: none;
-  margin-left: 1px;
-  margin-right: 1px;
-}
-
-#clear-button:hover:active {
-  list-style-image: url("chrome://global/skin/icons/close-act.gif");
-  border: none;
-  margin-left: 1px;
-  margin-right: 1px;
-}
-
 #page-proxy-deck {
   cursor: grab;
   margin-right: 4px;
diff --git a/xpfe/browser/resources/content/navigator.js b/xpfe/browser/resources/content/navigator.js
index f78370f8e91..3f1890262f7 100644
--- a/xpfe/browser/resources/content/navigator.js
+++ b/xpfe/browser/resources/content/navigator.js
@@ -601,12 +601,6 @@ function BrowserStop()
   }
 }
 
-function clearLocationBar()
-{
-   gURLBar.value = "";
-   gURLBar.focus();
-}
-
 function BrowserReload()
 {
   const reloadFlags = nsIWebNavigation.LOAD_FLAGS_NONE;
diff --git a/xpfe/browser/resources/content/navigator.xul b/xpfe/browser/resources/content/navigator.xul
index b52d5a8a6de..fcfa2b524d3 100644
--- a/xpfe/browser/resources/content/navigator.xul
+++ b/xpfe/browser/resources/content/navigator.xul
@@ -155,9 +155,6 @@ Contributor(s): ______________________________________. -->
       </hbox>
  
       <hbox id="nav-bar-inner" flex="1">
-        <toolbarbutton id="clear-button" oncommand="clearLocationBar();"
-                 tooltiptext="&clearButton.tooltip;"
-	         class="toolbar-button"/>
         <textbox id="urlbar" class="chromeclass-location" flex="1"
                  type="autocomplete" searchSessions="history" 
                  timeout="50" maxrows="6" alwaysopenpopup="true"
diff --git a/xpfe/browser/resources/locale/en-US/navigator.dtd b/xpfe/browser/resources/locale/en-US/navigator.dtd
index 7831c311f74..9f2da40d9dc 100644
--- a/xpfe/browser/resources/locale/en-US/navigator.dtd
+++ b/xpfe/browser/resources/locale/en-US/navigator.dtd
@@ -188,7 +188,6 @@
 <!ENTITY reloadButton.tooltip         "Reload current page">
 <!ENTITY stopButton.label             "Stop">
 <!ENTITY stopButton.tooltip           "Stop loading this page">
-<!ENTITY clearButton.tooltip          "Clear the location bar">
 <!ENTITY searchButton.label           "Search">
 <!ENTITY searchButton.tooltip         "Type a word in the field to the left, then click Search">
 <!ENTITY goButton.label               "Go">
diff --git a/xpfe/components/prefwindow/resources/content/pref-navigator.xul b/xpfe/components/prefwindow/resources/content/pref-navigator.xul
index c48217ed733..b7b02dc2e15 100644
--- a/xpfe/components/prefwindow/resources/content/pref-navigator.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-navigator.xul
@@ -36,7 +36,7 @@
   <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["startupPage", "browserStartupHomepage",
-                       "bookmarksButton", "clearButton", "goButton",
+                       "bookmarksButton", "goButton",
                        "homeButton", "printButton",
                        "searchButton" ];
   ]]>
@@ -101,9 +101,6 @@
       	      <checkbox id="printButton"
                         label="&printButton.label;"
                         prefstring="browser.toolbars.showbutton.print"/>
-      	      <checkbox id="clearButton"
-                        label="&clearButton.label;"
-                        prefstring="browser.toolbars.showbutton.clear"/>
       </vbox>
       <vbox id="prefShowButtonBox">
 
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-navigator.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-navigator.dtd
index f79f0696479..36bb366a227 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-navigator.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-navigator.dtd
@@ -20,7 +20,6 @@
 <!ENTITY  toolbarIntro.label        "Select the buttons you want to see in the toolbars">
 
 <!ENTITY  bookmarksButton.label     "Bookmarks">
-<!ENTITY  clearButton.label         "Clear">
 <!ENTITY  goButton.label            "Go">
 <!ENTITY  homeButton.label          "Home">
 <!ENTITY  printButton.label         "Print">