From 940c9d74340de67dbf0b0bedc4bb2be9e386133c Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Fri, 24 Sep 2010 17:10:37 -0400
Subject: [PATCH] Fix some missed option transformations from revision
 99347338113f.

---
 common/content/bookmarks.js | 2 +-
 common/content/hints.js     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/content/bookmarks.js b/common/content/bookmarks.js
index 61a53e55..2c82376c 100644
--- a/common/content/bookmarks.js
+++ b/common/content/bookmarks.js
@@ -510,7 +510,7 @@ const Bookmarks = Module("bookmarks", {
             if (!context.filter)
                 return;
 
-            let engineList = (engineAliases || options["suggestengines"] || "google").split(",");
+            let engineList = (engineAliases || options["suggestengines"].join(",") || "google").split(",");
 
             let completions = [];
             engineList.forEach(function (name) {
diff --git a/common/content/hints.js b/common/content/hints.js
index 00b586b7..b66b3d51 100644
--- a/common/content/hints.js
+++ b/common/content/hints.js
@@ -41,8 +41,8 @@ const Hints = Module("hints", {
         });
 
         const Mode = Hints.Mode;
-        Mode.defaultValue("tags", function () function () options.hinttags);
-        function extended() options.extendedhinttags;
+        Mode.defaultValue("tags", function () function () options["hinttags"]);
+        function extended() options["extendedhinttags"];
         function images() util.makeXPath(["img"]);
 
         this._hintModes = {
@@ -128,7 +128,7 @@ const Hints = Module("hints", {
         if (elem instanceof HTMLInputElement && set.has(Events.editableInputs, elem.type))
             return [elem.value, false];
         else {
-            for (let [, option] in Iterator(options["hintinputs"].split(","))) {
+            for (let [, option] in Iterator(options["hintinputs"])) {
                 if (option == "value") {
                     if (elem instanceof HTMLSelectElement) {
                         if (elem.selectedIndex >= 0)
@@ -718,7 +718,7 @@ const Hints = Module("hints", {
      *     element that matches.
      * @param {function():string} tags The function that returns an
      *     XPath expression to decide which elements can be hinted (the
-     *     default returns options.hinttags).
+     *     default returns options["hinttags"]).
      * @optional
      */
     addMode: function (mode, prompt, action, tags) {