# HG changeset patch # User Wolfgang Rosenauer # Date 1558695472 -7200 # Node ID 9c008b241362de0fe553c15a89118b355d963a8a # Parent a25638dad81de796c7c270c8cd50a8792dc52005 fixed syntax issue diff -r a25638dad81d -r 9c008b241362 mozilla-nongnome-proxies.patch --- a/mozilla-nongnome-proxies.patch Thu May 23 09:16:13 2019 +0200 +++ b/mozilla-nongnome-proxies.patch Fri May 24 12:57:52 2019 +0200 @@ -9,7 +9,7 @@ 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 -@@ -57,25 +57,27 @@ NS_IMETHODIMP +@@ -57,24 +57,27 @@ NS_IMETHODIMP nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) { // dbus prevents us from being threadsafe, but this routine should not block // anyhow @@ -26,7 +26,6 @@ - } - if (!mProxySettings) { - mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID); -- } + // only use GSettings if that is a GNOME session + const char* sessionType = PR_GetEnv("DESKTOP_SESSION"); + if (sessionType && !strcmp(sessionType, "gnome")) { @@ -38,6 +37,7 @@ + if (!mProxySettings) { + mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID); + } + } } bool nsUnixSystemProxySettings::IsProxyMode(const char* aMode) { @@ -45,4 +45,3 @@ return NS_SUCCEEDED(mGConf->GetString( NS_LITERAL_CSTRING("/system/proxy/mode"), mode)) && mode.EqualsASCII(aMode); - }