From 903e3fd9df54133e01596518da14011395816e5c Mon Sep 17 00:00:00 2001
From: "hyatt%netscape.com" <hyatt%netscape.com>
Date: Tue, 6 Aug 2002 08:03:33 +0000
Subject: [PATCH] Make restoring the default set work.

---
 browser/base/content/customizeToolbar.js  | 23 -----------------------
 browser/base/content/customizeToolbar.xul |  2 +-
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/browser/base/content/customizeToolbar.js b/browser/base/content/customizeToolbar.js
index 1e5bcffd6348..dd8063f6134a 100644
--- a/browser/base/content/customizeToolbar.js
+++ b/browser/base/content/customizeToolbar.js
@@ -71,30 +71,7 @@ function buildDialog()
   var toolbarItem = toolbar.firstChild;
   while (toolbarItem) {
     var newItem = toolbarItem.cloneNode(true);
-<<<<<<< customizeToolbar.js
     addItemToToolbar(newItem, newToolbar);
-=======
-    newItem.removeAttribute("observes");
-    newItem.removeAttribute("disabled");
-    newItem.removeAttribute("type");
-
-    if (newItem.localName == "toolbaritem" && 
-        newItem.firstChild) {
-      newItem.firstChild.removeAttribute("observes");
-      if (newItem.firstChild.localName == "textbox")
-        newItem.firstChild.setAttribute("disabled", "true");
-      else
-        newItem.firstChild.removeAttribute("disabled");
-    }
-
-    enclosure = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",
-                                         "toolbarpaletteitem");
-    
-    // Set a draggesture handler to allow drag-rearrange within the clone toolbar.
-    enclosure.setAttribute("ondraggesture", "gDraggingFromPalette = false; nsDragAndDrop.startDrag(event, dragObserver)");
-    enclosure.appendChild(newItem);
-    newToolbar.appendChild(enclosure);
->>>>>>> 1.20
     toolbarItem = toolbarItem.nextSibling;
   }
 
diff --git a/browser/base/content/customizeToolbar.xul b/browser/base/content/customizeToolbar.xul
index 946afec4c90e..30fb0d93b652 100644
--- a/browser/base/content/customizeToolbar.xul
+++ b/browser/base/content/customizeToolbar.xul
@@ -65,7 +65,7 @@
   </menupopup>
 </menulist>
 <checkbox label="&useSmallIcons.label;"/>
-<button label="&restoreDefaultSet.label;"/>
+<button label="&restoreDefaultSet.label;" oncommand="resetToDefault()"/>
 <spacer flex="1"/>
 <image id="trash-can"
         ondragover="nsDragAndDrop.dragOver(event, trashObserver);"