From a7ef6e47c7b58dfecd2c575e33d6d8a06d7b9436 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Wed, 22 Sep 2010 15:33:25 -0400
Subject: [PATCH] Fix some noise on FF 3.6.

---
 common/content/dactyl-overlay.js |  4 ++--
 common/modules/bookmarkcache.jsm | 15 ++++++---------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/common/content/dactyl-overlay.js b/common/content/dactyl-overlay.js
index c6c7e5fb..04f0ddfa 100644
--- a/common/content/dactyl-overlay.js
+++ b/common/content/dactyl-overlay.js
@@ -20,8 +20,8 @@
                 return;
             }
             catch (e) {
-                if (e !== "Error opening input stream (invalid filename?)") {
-                    dump("dactyl: Trying: " + (base + script + ".js") + ": " + e + "\n" + e.stack);
+                if (typeof e !== "string") {
+                    dump("dactyl: Trying: " + (base + script + ".js") + ": " + e + "\n" + e.stack + "\n");
                     Components.utils.reportError(e);
                 }
             }
diff --git a/common/modules/bookmarkcache.jsm b/common/modules/bookmarkcache.jsm
index d9c4fa8a..c31111ec 100644
--- a/common/modules/bookmarkcache.jsm
+++ b/common/modules/bookmarkcache.jsm
@@ -111,10 +111,11 @@ const BookmarkCache = Module("BookmarkCache", {
         return bookmarks;
     },
 
-    onBeginUpdateBatch: function onBeginUpdateBatch() {},
-    onEndUpdateBatch:   function onEndUpdateBatch() {},
-    onItemVisited:      function onItemVisited() {},
-    onItemMoved:        function onItemMoved() {},
+    onBeforeItemRemoved: function () {},
+    onBeginUpdateBatch:  function onBeginUpdateBatch() {},
+    onEndUpdateBatch:    function onEndUpdateBatch() {},
+    onItemVisited:       function onItemVisited() {},
+    onItemMoved:         function onItemMoved() {},
     onItemAdded: function onItemAdded(itemId, folder, index) {
         if (bookmarks.getItemType(itemId) == bookmarks.TYPE_BOOKMARK) {
             if (this.isBookmark(itemId)) {
@@ -140,11 +141,7 @@ const BookmarkCache = Module("BookmarkCache", {
             storage.fireEvent(name, "change", itemId);
         }
     },
-    QueryInterface: function QueryInterface(iid) {
-        if (iid.equals(Ci.nsINavBookmarkObserver) || iid.equals(Ci.nsISupports))
-            return this;
-        throw Cr.NS_ERROR_NO_INTERFACE;
-    }
+    QueryInterface: XPCOMUtils.generateQI([Ci.nsINavBookmarkObserver])
 }, {
     getFavicon: function getFavicon(uri) {
         try {