From 2427a48a873c37f2eaf1882e43f54f1dabe12e31 Mon Sep 17 00:00:00 2001
From: "thunder@mozilla.com" <thunder@mozilla.com>
Date: Tue, 22 May 2007 14:49:00 -0700
Subject: [PATCH] Bug 381245: Add back the bookmarks toolbar icon to toggle the
 bookmarks sidebar. r=dietrich

---
 browser/base/content/browser.js  | 8 ++++++--
 browser/base/content/browser.xul | 2 --
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 563bd25ab75e..ac1b2fc7f89b 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -2792,19 +2792,24 @@ function openHomeDialog(aURL)
   }
 }
 
-#ifndef MOZ_PLACES_BOOKMARKS
 var bookmarksButtonObserver = {
   onDrop: function (aEvent, aXferData, aDragSession)
   {
     var split = aXferData.data.split("\n");
     var url = split[0];
     if (url != aXferData.data) {  //do nothing if it's not a valid URL
+#ifndef MOZ_PLACES_BOOKMARKS
       var dialogArgs = {
         name: split[1],
         url: url
       }
       openDialog("chrome://browser/content/bookmarks/addBookmark2.xul", "",
                  BROWSER_ADD_BM_FEATURES, dialogArgs);
+#else
+      var ios = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
+      var uri = ios.newURI(url, null, null);
+      PlacesUtils.showAddBookmarkUI(uri, split[1]);
+#endif
     }
   },
 
@@ -2830,7 +2835,6 @@ var bookmarksButtonObserver = {
     return flavourSet;
   }
 }
-#endif
 
 var newTabButtonObserver = {
   onDragOver: function(aEvent, aFlavour, aDragSession)
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 2ccc4474ab52..7404282573b0 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -397,14 +397,12 @@
                        observes="viewHistorySidebar" label="&historyButton.label;"
                        tooltiptext="&historyButton.tooltip;"/>
 
-#ifndef MOZ_PLACES_BOOKMARKS
         <toolbarbutton id="bookmarks-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
                        observes="viewBookmarksSidebar"
                        tooltiptext="&bookmarksButton.tooltip;"
                        ondragover="nsDragAndDrop.dragOver(event, bookmarksButtonObserver);"
                        ondragdrop="nsDragAndDrop.drop(event, bookmarksButtonObserver);"
                        ondragexit="nsDragAndDrop.dragExit(event, bookmarksButtonObserver);"/>
-#endif
 
         <toolbarbutton id="new-tab-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
                        label="&tabCmd.label;"