From 74b2234cf0c0f37078050ad6981bb40fee15e180 Mon Sep 17 00:00:00 2001
From: Eitan Isaacson <eitan@monotonous.org>
Date: Fri, 18 May 2012 11:56:38 -0700
Subject: [PATCH] Bug 756529 - Move accessfu setting to
 accessibility.accessfu.activate. r=davidb

---
 accessible/src/jsat/AccessFu.jsm | 10 +++++-----
 mobile/android/app/mobile.js     |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/accessible/src/jsat/AccessFu.jsm b/accessible/src/jsat/AccessFu.jsm
index b34c920549e9..60363b9bf1c1 100644
--- a/accessible/src/jsat/AccessFu.jsm
+++ b/accessible/src/jsat/AccessFu.jsm
@@ -39,12 +39,12 @@ var AccessFu = {
     this.presenters = [];
 
     this.prefsBranch = Cc['@mozilla.org/preferences-service;1']
-      .getService(Ci.nsIPrefService).getBranch('accessibility.');
-    this.prefsBranch.addObserver('accessfu', this, false);
+      .getService(Ci.nsIPrefService).getBranch('accessibility.accessfu.');
+    this.prefsBranch.addObserver('activate', this, false);
 
     let accessPref = ACCESSFU_DISABLE;
     try {
-      accessPref = this.prefsBranch.getIntPref('accessfu');
+      accessPref = this.prefsBranch.getIntPref('activate');
     } catch (x) {
     }
 
@@ -176,8 +176,8 @@ var AccessFu = {
           this._disable();
         break;
       case 'nsPref:changed':
-        if (aData == 'accessfu')
-          this._processPreferences(this.prefsBranch.getIntPref('accessfu'));
+        if (aData == 'activate')
+          this._processPreferences(this.prefsBranch.getIntPref('activate'));
         break;
       case 'accessible-event':
         let event;
diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
index 3f047f5aff6e..8645b7d22133 100644
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -760,7 +760,7 @@ pref("ui.scrolling.min_scrollable_distance", -1);
 pref("ui.zooming.animation_frames", "");
 
 // Enable accessibility mode if platform accessibility is enabled.
-pref("accessibility.accessfu", 2);
+pref("accessibility.accessfu.activate", 2);
 
 // Mobile manages state by autodetection
 pref("network.manage-offline-status", true);