From 93bfd0880fc99ef79b8cd199c0f7a56abeb77f08 Mon Sep 17 00:00:00 2001
From: teramako <teramako@gmail.com>
Date: Fri, 13 Nov 2009 00:30:54 +0900
Subject: [PATCH 1/2] should push 'Win32' to confing.features before io.js is
 initialized

---
 common/content/liberator.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/content/liberator.js b/common/content/liberator.js
index 086c5421..8e329f4a 100644
--- a/common/content/liberator.js
+++ b/common/content/liberator.js
@@ -66,6 +66,8 @@ const Liberator = Module("liberator", {
         // without explicitly selecting a profile.
         /** @property {string} The name of the current user profile. */
         this.profileName = services.get("directory").get("ProfD", Ci.nsIFile).leafName.replace(/^.+?\./, "");
+
+        config.features.push(Liberator.getPlatformFeature());
     },
 
     destroy: function () {
@@ -1730,8 +1732,6 @@ const Liberator = Module("liberator", {
         };
     },
     load: function () {
-        config.features.push(Liberator.getPlatformFeature());
-
         liberator.triggerObserver("load");
 
         liberator.log("All modules loaded", 3);

From 01696096b073fdbd98c95cc90a94bfa51e00e9ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20N=C4=9Bmec?= <stepnem@gmail.com>
Date: Thu, 12 Nov 2009 18:51:03 +0100
Subject: [PATCH 2/2] Fix a slight messup in options.js caused by recent
 refactoring (4053:0c26dd7f1345).

---
 common/content/options.js | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/common/content/options.js b/common/content/options.js
index 7710da29..bd519dd7 100644
--- a/common/content/options.js
+++ b/common/content/options.js
@@ -1117,26 +1117,10 @@ const Options = Module("options", {
                             else if (matches[3] == ".")
                                 reference[0][reference[1]] += expr.toString();
                         }
-                        else {
-                            if (!reference[0]) {
-                                if (reference[2] == "g")
-                                    reference[0] = liberator.globalVariables;
-                                else
-                                    return; // for now
-                            }
 
-                            if (matches[3]) {
-                                if (matches[3] == "+")
-                                    reference[0][reference[1]] += expr;
-                                else if (matches[3] == "-")
-                                    reference[0][reference[1]] -= expr;
-                                else if (matches[3] == ".")
-                                    reference[0][reference[1]] += expr.toString();
-                            }
-                            else
-                                reference[0][reference[1]] = expr;
-                        }
-                    }
+                        else
+                            reference[0][reference[1]] = expr;
+                     }
                 }
                 // 1 - name
                 else if (matches = args.match(/^\s*([\w:]+)\s*$/)) {