Temporarily revert "Make some trivial changes to reduce RAM consumption"

pde · pde · commit 09e15a9f3af3 · 2012-01-14T15:19:09.000-08:00
This reverts commit e662bc6. Temporarily revert "This was the real culprit in terms of RAM bloatage." This reverts commit faad987. Conflicts: src/components/https-everywhere.js
diff --git a/src/chrome/content/code/HTTPSRules.js b/src/chrome/content/code/HTTPSRules.js
@@ -1,11 +1,11 @@
 function Rule(from, to) {
-  //this.from = from;
-  //this.to = to;
+  this.from = from;
+  this.to = to;
   this.from_c = new RegExp(from);
 }
 
 function Exclusion(pattern) {
-  //this.pattern = pattern;
+  this.pattern = pattern;
   this.pattern_c = new RegExp(pattern);
 }
 
@@ -18,11 +18,11 @@ function CookieRule(host, cookiename) {
 
 ruleset_counter = 0;
 function RuleSet(name, match_rule, default_off) {
-  this.id="httpseR" + ruleset_counter;
+  this.id="https-everywhere-rule-" + ruleset_counter;
   ruleset_counter += 1;
   this.on_by_default = true;
   this.name = name;
-  //this.ruleset_match = match_rule;
+  this.ruleset_match = match_rule;
   this.notes = "";
   if (match_rule)   this.ruleset_match_c = new RegExp(match_rule)
   else              this.ruleset_match_c = null;
@@ -36,7 +36,7 @@ function RuleSet(name, match_rule, default_off) {
   this.rules = [];
   this.exclusions = [];
   this.cookierules = [];
-  this.prefs = HTTPSEverywhere.instance.prefs;
+  this.prefs = HTTPSEverywhere.instance.get_prefs();
   try {
     // if this pref exists, use it
     this.active = this.prefs.getBoolPref(name);
diff --git a/src/components/https-everywhere.js b/src/components/https-everywhere.js
@@ -160,6 +160,10 @@ function HTTPSEverywhere() {
   this.ApplicableList = ApplicableList;
   
   this.prefs = this.get_prefs();
+  var prefs = CC["@mozilla.org/preferences-service;1"]
+        .getService(Components.interfaces.nsIPrefService);
+  var branch = prefs.getBranch("extensions.https_everywhere.");
+
   
   // We need to use observers instead of categories for FF3.0 for these:
   // https://developer.mozilla.org/en/Observer_Notifications
@@ -225,7 +229,6 @@ const shouldLoadTargets = {
 // HTTP redirects) correctly.
 
 HTTPSEverywhere.prototype = {
-  prefs: null,
   // properties required for XPCOM registration:
   classDescription: SERVICE_NAME,
   classID:          SERVICE_ID,
