From 6ad90c9593562de28c3e44602c52b6036791a474 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 16 Feb 2014 21:04:02 +1100
Subject: [PATCH] Fix new buffer.prefs.*

---
 common/modules/buffer.jsm   | 8 ++++----
 common/modules/services.jsm | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/modules/buffer.jsm b/common/modules/buffer.jsm
index e196344b..b69e0b88 100644
--- a/common/modules/buffer.jsm
+++ b/common/modules/buffer.jsm
@@ -87,7 +87,7 @@ var Buffer = Module("Buffer", {
              */
             get: promises.withCallbacks(function get([resolve], pref) {
                 services.contentPrefs.getByDomainAndName(
-                    self.uri.host, pref, self.loadContext,
+                    self.uri.spec, pref, self.loadContext,
                     resolve);
             }),
 
@@ -99,7 +99,7 @@ var Buffer = Module("Buffer", {
              */
             set: promises.withCallbacks(function set([resolve], pref, value) {
                 services.contentPrefs.set(
-                    self.uri.host, pref, value, self.loadContext,
+                    self.uri.spec, pref, value, self.loadContext,
                     resolve);
             }),
 
@@ -110,8 +110,8 @@ var Buffer = Module("Buffer", {
              */
             clear: promises.withCallbacks(function clear([resolve], pref) {
                 services.contentPrefs.removeByDomainAndName(
-                    self.uri.domain, pref, self.loadContext, resolve);
-            }),
+                    self.uri.spec, pref, self.loadContext, resolve);
+            })
         })),
 
     /**
diff --git a/common/modules/services.jsm b/common/modules/services.jsm
index 1e26f69e..e1412b00 100644
--- a/common/modules/services.jsm
+++ b/common/modules/services.jsm
@@ -39,7 +39,7 @@ var Services = Module("Services", {
         this.add("clipboardHelper",     "@mozilla.org/widget/clipboardhelper;1",            "nsIClipboardHelper");
         this.add("commandLineHandler",  "@mozilla.org/commandlinehandler/general-startup;1?type=dactyl");
         this.add("console",             "@mozilla.org/consoleservice;1",                    "nsIConsoleService");
-        this.add("contentPrefs",        "@mozilla.org/content-pref/service;1",              "nsIContentPrefService");
+        this.add("contentPrefs",        "@mozilla.org/content-pref/service;1",              ["nsIContentPrefService", "nsIContentPrefService2"]);
         this.add("dactyl",              "@dactyl.googlecode.com/extra/utils",               "dactylIUtils");
         this.add("dactyl:",             this.PROTOCOL + "dactyl");
         this.add("debugger",            "@mozilla.org/js/jsd/debugger-service;1",           "jsdIDebuggerService");