From 0a054a6f3f0e0bc5708e1de7f01ed6463e375418 Mon Sep 17 00:00:00 2001
From: "neil%parkwaycc.co.uk" <neil%parkwaycc.co.uk>
Date: Fri, 23 Jan 2004 13:23:20 +0000
Subject: [PATCH] Bug 181602 accessible/ should be using the new pref apis
 p=arne.anka@stupido.com r=caillon sr=peterv

---
 accessible/src/msaa/nsAccessNodeWrap.cpp     | 10 +++++-----
 accessible/src/msaa/nsRootAccessibleWrap.cpp |  1 -
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/accessible/src/msaa/nsAccessNodeWrap.cpp b/accessible/src/msaa/nsAccessNodeWrap.cpp
index 6472c681fd08..512985234f87 100644
--- a/accessible/src/msaa/nsAccessNodeWrap.cpp
+++ b/accessible/src/msaa/nsAccessNodeWrap.cpp
@@ -47,7 +47,8 @@
 #include "nsIDOMViewCSS.h"
 #include "nsIFrame.h"
 #include "nsINameSpaceManager.h"
-#include "nsIPref.h"
+#include "nsIPrefService.h"
+#include "nsIPrefBranch.h"
 #include "nsIPresShell.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIServiceManager.h"
@@ -61,7 +62,6 @@ LPFNNOTIFYWINEVENT nsAccessNodeWrap::gmNotifyWinEvent = nsnull;
 LPFNGETGUITHREADINFO nsAccessNodeWrap::gmGetGUIThreadInfo = nsnull;
 
 PRBool nsAccessNodeWrap::gIsEnumVariantSupportDisabled = 0;
-static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
 
 /* For documentation of the accessibility architecture, 
  * see http://lxr.mozilla.org/seamonkey/source/accessible/accessible-docs.html
@@ -530,9 +530,9 @@ void nsAccessNodeWrap::InitAccessibility()
     return;
   }
 
-  nsCOMPtr<nsIPref> prefService(do_GetService(kPrefCID));
-  if (prefService) {
-    prefService->GetBoolPref("accessibility.disableenumvariant", &gIsEnumVariantSupportDisabled);
+  nsCOMPtr<nsIPrefBranch> prefBranch(do_GetService(NS_PREFSERVICE_CONTRACTID));
+  if (prefBranch) {
+    prefBranch->GetBoolPref("accessibility.disableenumvariant", &gIsEnumVariantSupportDisabled);
   }
 
   if (!gmUserLib) {
diff --git a/accessible/src/msaa/nsRootAccessibleWrap.cpp b/accessible/src/msaa/nsRootAccessibleWrap.cpp
index 1606df7d997a..f27f5a7f46a2 100644
--- a/accessible/src/msaa/nsRootAccessibleWrap.cpp
+++ b/accessible/src/msaa/nsRootAccessibleWrap.cpp
@@ -39,7 +39,6 @@
 #include "nsRootAccessibleWrap.h"
 #include "nsIAccessible.h"
 #include "nsIAccessibleDocument.h"
-#include "nsIPref.h"
 #include "nsIServiceManager.h"
 
 /* For documentation of the accessibility architecture,