# HG changeset patch

# User Wolfgang Rosenauer

# Date 1558442915 -7200

#      Tue May 21 14:48:35 2019 +0200

# Node ID 6bcf2dfebc1ea2aa34e5cc61152709fc8e409dc5

# Parent  bd5d1f49975deb730064a16b3079edb53c4a5f84

Do not use gconf for proxy settings if not running within Gnome

Index: toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp

===================================================================

RCS file: /cvsroot/mozilla/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp,v

retrieving revision 1.1

diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp

--- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp

+++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp

@@ -49,20 +49,24 @@ NS_IMETHODIMP

 nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) {

   // dbus prevents us from being threadsafe, but this routine should not block

   // anyhow

   *aMainThreadOnly = true;

   return NS_OK;

 }

 void nsUnixSystemProxySettings::Init() {

-  mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID);

-  if (mGSettings) {

-    mGSettings->GetCollectionForSchema("org.gnome.system.proxy"_ns,

-                                       getter_AddRefs(mProxySettings));

+  const char* sessionType = PR_GetEnv("DESKTOP_SESSION");

+  if (sessionType && !strcmp(sessionType, "gnome")) {

+    mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID);

+    if (mGSettings) {

+      mGSettings->GetCollectionForSchema(

+          "org.gnome.system.proxy"_ns,

+          getter_AddRefs(mProxySettings));

+    }

   }

 }

 nsresult nsUnixSystemProxySettings::GetPACURI(nsACString& aResult) {

   if (mProxySettings) {

     nsCString proxyMode;

     // Check if mode is auto

     nsresult rv = mProxySettings->GetString("mode"_ns, proxyMode);