diff -r ba0c97b018a6 -r 2a24a948b5cf mozilla-nongnome-proxies.patch --- a/mozilla-nongnome-proxies.patch Mon Jun 05 21:17:55 2023 +0200 +++ b/mozilla-nongnome-proxies.patch Sat Jul 29 14:34:45 2023 +0200 @@ -3,7 +3,7 @@ # Date 1558442915 -7200 # Tue May 21 14:48:35 2019 +0200 # Node ID 6bcf2dfebc1ea2aa34e5cc61152709fc8e409dc5 -# Parent bd5d1f49975deb730064a16b3079edb53c4a5f84 +# Parent 715f01d61df8627117e6aefca540f0c1bba45011 Do not use gconf for proxy settings if not running within Gnome Index: toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp =================================================================== @@ -13,12 +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,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; +@@ -52,10 +52,13 @@ nsUnixSystemProxySettings::GetMainThread } void nsUnixSystemProxySettings::Init() { @@ -30,15 +25,9 @@ + if (sessionType && !strcmp(sessionType, "gnome")) { + mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID); + if (mGSettings) { -+ mGSettings->GetCollectionForSchema( -+ "org.gnome.system.proxy"_ns, -+ getter_AddRefs(mProxySettings)); ++ 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);