2019-07-09 23:21:11 +02:00
|
|
|
# HG changeset patch
|
|
|
|
# User Wolfgang Rosenauer
|
|
|
|
# Date 1558442915 -7200
|
|
|
|
# Tue May 21 14:48:35 2019 +0200
|
|
|
|
# Node ID 6bcf2dfebc1ea2aa34e5cc61152709fc8e409dc5
|
|
|
|
# Parent 4c434d19d03d5461e54fa22dfb82eaed4cd6631b
|
|
|
|
Do not use gconf for proxy settings if not running within Gnome
|
2011-06-01 08:05:09 +02:00
|
|
|
Index: toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
|
|
|
|
===================================================================
|
|
|
|
RCS file: /cvsroot/mozilla/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp,v
|
|
|
|
retrieving revision 1.1
|
2012-02-01 14:37:15 +01:00
|
|
|
|
2019-07-09 23:21:11 +02:00
|
|
|
diff -r 4c434d19d03d -r 6bcf2dfebc1e toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
|
|
|
|
--- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp Wed Jun 12 17:43:18 2019 +0000
|
|
|
|
+++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp Tue May 21 14:48:35 2019 +0200
|
|
|
|
@@ -55,11 +55,14 @@
|
2013-01-07 21:49:28 +01:00
|
|
|
}
|
2011-06-01 08:05:09 +02:00
|
|
|
|
2019-05-22 22:38:29 +02:00
|
|
|
void nsUnixSystemProxySettings::Init() {
|
2012-03-01 10:09:12 +01:00
|
|
|
- mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID);
|
2012-06-05 20:01:53 +02:00
|
|
|
- if (mGSettings) {
|
2019-01-29 19:07:12 +01:00
|
|
|
- mGSettings->GetCollectionForSchema(
|
|
|
|
- NS_LITERAL_CSTRING("org.gnome.system.proxy"),
|
|
|
|
- getter_AddRefs(mProxySettings));
|
2011-06-01 08:05:09 +02:00
|
|
|
+ const char* sessionType = PR_GetEnv("DESKTOP_SESSION");
|
|
|
|
+ if (sessionType && !strcmp(sessionType, "gnome")) {
|
2012-03-01 10:09:12 +01:00
|
|
|
+ mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID);
|
2012-06-05 20:01:53 +02:00
|
|
|
+ if (mGSettings) {
|
2019-07-09 23:21:11 +02:00
|
|
|
+ mGSettings->GetCollectionForSchema(
|
|
|
|
+ NS_LITERAL_CSTRING("org.gnome.system.proxy"),
|
|
|
|
+ getter_AddRefs(mProxySettings));
|
2012-06-05 20:01:53 +02:00
|
|
|
+ }
|
2019-05-24 12:52:31 +02:00
|
|
|
}
|
2011-06-01 08:05:09 +02:00
|
|
|
}
|
|
|
|
|