1 files changed, 35 insertions, 0 deletions
diff --git a/waterfox-g/debian/patches/nongnome-proxies.patch b/waterfox-g/debian/patches/nongnome-proxies.patch
new file mode 100644
index 0000000..5eaf79d
--- /dev/null
+++ b/waterfox-g/debian/patches/nongnome-proxies.patch
@@ -0,0 +1,35 @@
+From: Wolfgang Rosenauer
+Subject: Do not use gconf for proxy settings if not running within Gnome
+
+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);