From 46d87aa05fb34d4184ecbfa22173c9e82594f24f Mon Sep 17 00:00:00 2001
From: "bzbarsky%mit.edu" <bzbarsky%mit.edu>
Date: Tue, 3 Feb 2004 06:18:41 +0000
Subject: [PATCH] Don't error out if keyword.enabled is just not set.  Bug
 229083, patch by Patrick McCormick <patrick@meer.net>, r+sr=bzbarsky

---
 docshell/base/nsWebShell.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/docshell/base/nsWebShell.cpp b/docshell/base/nsWebShell.cpp
index c47531b60359..3cee85c9357c 100644
--- a/docshell/base/nsWebShell.cpp
+++ b/docshell/base/nsWebShell.cpp
@@ -799,10 +799,8 @@ nsresult nsWebShell::EndPageLoad(nsIWebProgress *aProgress,
       {
         PRBool keywordsEnabled = PR_FALSE;
 
-        if(mPrefs) {
-          rv = mPrefs->GetBoolPref("keyword.enabled", &keywordsEnabled);
-          if (NS_FAILED(rv)) return rv;
-        }
+        if (mPrefs && NS_FAILED(mPrefs->GetBoolPref("keyword.enabled", &keywordsEnabled)))
+            keywordsEnabled = PR_FALSE;
 
         nsCAutoString host;
         url->GetHost(host);