--- a/mozilla-nongnome-proxies.patch Sun Jun 28 08:52:27 2020 +0200
+++ b/mozilla-nongnome-proxies.patch Wed Oct 07 13:48:57 2020 +0200
@@ -3,7 +3,7 @@
# Date 1558442915 -7200
# Tue May 21 14:48:35 2019 +0200
# Node ID 6bcf2dfebc1ea2aa34e5cc61152709fc8e409dc5
-# Parent dc1684693eed684bdafeff0ad78d4f6d288fcae1
+# Parent bd5d1f49975deb730064a16b3079edb53c4a5f84
Do not use gconf for proxy settings if not running within Gnome
Index: toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
===================================================================
@@ -13,7 +13,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
-@@ -49,21 +49,24 @@ NS_IMETHODIMP
+@@ -49,20 +49,24 @@ NS_IMETHODIMP
nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) {
// dbus prevents us from being threadsafe, but this routine should not block
// anyhow
@@ -24,15 +24,14 @@
void nsUnixSystemProxySettings::Init() {
- mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID);
- if (mGSettings) {
-- mGSettings->GetCollectionForSchema(
-- NS_LITERAL_CSTRING("org.gnome.system.proxy"),
-- getter_AddRefs(mProxySettings));
+- 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(
-+ NS_LITERAL_CSTRING("org.gnome.system.proxy"),
++ "org.gnome.system.proxy"_ns,
+ getter_AddRefs(mProxySettings));
+ }
}
@@ -42,4 +41,4 @@
if (mProxySettings) {
nsCString proxyMode;
// Check if mode is auto
- nsresult rv =
+ nsresult rv = mProxySettings->GetString("mode"_ns, proxyMode);