b=715063 don't warn when org.gnome.system.proxy GSettings schemas are not found r=roc

2012-01-05 11:16:27 +13:00
parent c69f2a7f02
commit 9c899f4bb8
1 changed files with 2 additions and 1 deletions
--- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
+++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
@@ -456,7 +456,8 @@ nsUnixSystemProxySettings::GetProxyFromGSettings(const nsACString& aScheme,

  rv = mGSettings->GetCollectionForSchema(NS_LITERAL_CSTRING("org.gnome.system.proxy"),
                                          getter_AddRefs(proxy_settings));
-  NS_ENSURE_SUCCESS(rv, rv);
+  if (NS_FAILED(rv))
+    return rv;

  nsCString proxyMode; 
  rv = proxy_settings->GetString(NS_LITERAL_CSTRING("mode"), proxyMode);