Index: src/yelp-gecko-utils.cpp
===================================================================
RCS file: /cvs/gnome/yelp/src/yelp-gecko-utils.cpp,v
retrieving revision 1.14
diff -p -u -u -p -r1.14 yelp-gecko-utils.cpp
--- src/yelp-gecko-utils.cpp	2 Nov 2005 21:49:48 -0000	1.14
+++ src/yelp-gecko-utils.cpp	8 Dec 2005 11:15:10 -0000
@@ -56,49 +56,52 @@ yelp_util_split_font_string (const gchar
 static gboolean
 gecko_prefs_set_bool (const gchar *key, gboolean value)
 {
-	nsCOMPtr<nsIPrefService> prefService =
-		do_GetService (NS_PREFSERVICE_CONTRACTID);
+	nsresult rv;
+	nsCOMPtr<nsIPrefService> prefService (do_GetService (NS_PREFSERVICE_CONTRACTID, &rv));
+	g_print ("do_GetService rv=%x\n", rv);
+	NS_ENSURE_SUCCESS (rv, FALSE);
+
 	nsCOMPtr<nsIPrefBranch> pref;
-	prefService->GetBranch ("", getter_AddRefs (pref));
+	rv = prefService->GetBranch ("", getter_AddRefs (pref));
+	NS_ENSURE_SUCCESS (rv, FALSE);
+
+	rv = pref->SetBoolPref (key, value);
 
-	if (pref) {
-		nsresult rv = pref->SetBoolPref (key, value);
-		return NS_SUCCEEDED (rv) ? TRUE : FALSE;
-	}
-	
-	return FALSE;
+	return NS_SUCCEEDED (rv) != PR_FALSE;
 }
 
 static gboolean
 gecko_prefs_set_string (const gchar *key, const gchar *value)
 {
-	nsCOMPtr<nsIPrefService> prefService =
-		do_GetService (NS_PREFSERVICE_CONTRACTID);
+	nsresult rv;
+	nsCOMPtr<nsIPrefService> prefService (do_GetService (NS_PREFSERVICE_CONTRACTID, &rv));
+	g_print ("do_GetService rv=%x\n", rv);
+	NS_ENSURE_SUCCESS (rv, FALSE);
+
 	nsCOMPtr<nsIPrefBranch> pref;
-	prefService->GetBranch ("", getter_AddRefs (pref));
+	rv = prefService->GetBranch ("", getter_AddRefs (pref));
+	NS_ENSURE_SUCCESS (rv, FALSE);
 
-	if (pref) {
-		nsresult rv = pref->SetCharPref (key, value);
-		return NS_SUCCEEDED (rv) ? TRUE : FALSE;
-	}
-	
-	return FALSE;
+	rv = pref->SetCharPref (key, value);
+
+	return NS_SUCCEEDED (rv) != PR_FALSE;
 }
 
 static gboolean
 gecko_prefs_set_int (const gchar *key, gint value)
 {
-	nsCOMPtr<nsIPrefService> prefService =
-		do_GetService (NS_PREFSERVICE_CONTRACTID);
+	nsresult rv;
+	nsCOMPtr<nsIPrefService> prefService (do_GetService (NS_PREFSERVICE_CONTRACTID, &rv));
+	g_print ("do_GetService rv=%x\n", rv);
+	NS_ENSURE_SUCCESS (rv, FALSE);
+
 	nsCOMPtr<nsIPrefBranch> pref;
-	prefService->GetBranch ("", getter_AddRefs (pref));
+	rv = prefService->GetBranch ("", getter_AddRefs (pref));
+	NS_ENSURE_SUCCESS (rv, FALSE);
+
+	rv = pref->SetIntPref (key, value);
 
-	if (pref) {
-		nsresult rv = pref->SetIntPref (key, value);
-		return NS_SUCCEEDED (rv) ? TRUE : FALSE;
-	}
-	
-	return FALSE;
+	return NS_SUCCEEDED (rv) != PR_FALSE;
 }
 
 extern "C" void