File mozilla-nongnome-proxies.patch of Package MozillaFirefox.11699

Overview Repositories Revisions Requests Users Attributes Meta

File mozilla-nongnome-proxies.patch of Package MozillaFirefox.11699

# HG changeset patch
# User Wolfgang Rosenauer
# Date 1560926108 -7200
#      Wed Jun 19 08:35:08 2019 +0200
# Node ID a0dced5a85d766a189f5328b9faa1fc92365ab93
# Parent  480a2541c9bd6bbadfaa035ebe364f66beec1d8b
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 -r 480a2541c9bd -r a0dced5a85d7 toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
--- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp	Tue Jun 18 16:09:42 2019 +0000
+++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp	Wed Jun 19 08:35:08 2019 +0200
@@ -60,16 +60,19 @@
 }
 
 nsresult nsUnixSystemProxySettings::Init() {
-  mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID);
-  if (mGSettings) {
-    mGSettings->GetCollectionForSchema(
-        NS_LITERAL_CSTRING("org.gnome.system.proxy"),
-        getter_AddRefs(mProxySettings));
+  // only use GSettings if that is a GNOME session
+  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"),
+                                         getter_AddRefs(mProxySettings));
+    }
+    if (!mProxySettings) {
+      mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
+    }
   }
-  if (!mProxySettings) {
-    mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
-  }
-
+ 
   return NS_OK;
 }

Places

File mozilla-nongnome-proxies.patch of Package MozillaFirefox.11699

Places