author | Wolfgang Rosenauer <wr@rosenauer.org> |
Wed, 15 May 2024 09:57:54 +0200 | |
branch | firefox125 |
changeset 1203 | 1b3d3cfc69c1 |
parent 1190 | 2a24a948b5cf |
permissions | -rw-r--r-- |
1097 | 1 |
# HG changeset patch |
2 |
# User Wolfgang Rosenauer |
|
3 |
# Date 1558442915 -7200 |
|
4 |
# Tue May 21 14:48:35 2019 +0200 |
|
5 |
# Node ID 6bcf2dfebc1ea2aa34e5cc61152709fc8e409dc5 |
|
1190 | 6 |
# Parent 715f01d61df8627117e6aefca540f0c1bba45011 |
1097 | 7 |
Do not use gconf for proxy settings if not running within Gnome |
0 | 8 |
Index: toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
9 |
=================================================================== |
|
10 |
RCS file: /cvsroot/mozilla/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp,v |
|
11 |
retrieving revision 1.1 |
|
367 | 12 |
|
1123 | 13 |
diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
14 |
--- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
|
15 |
+++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
|
1190 | 16 |
@@ -52,10 +52,13 @@ nsUnixSystemProxySettings::GetMainThread |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
419
diff
changeset
|
17 |
} |
0 | 18 |
|
1093 | 19 |
void nsUnixSystemProxySettings::Init() { |
382
67f876aafae8
lift up to Gecko 11beta
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
20 |
- mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID); |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
382
diff
changeset
|
21 |
- if (mGSettings) { |
1141 | 22 |
- mGSettings->GetCollectionForSchema("org.gnome.system.proxy"_ns, |
23 |
- getter_AddRefs(mProxySettings)); |
|
0 | 24 |
+ const char* sessionType = PR_GetEnv("DESKTOP_SESSION"); |
25 |
+ if (sessionType && !strcmp(sessionType, "gnome")) { |
|
382
67f876aafae8
lift up to Gecko 11beta
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
26 |
+ mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID); |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
382
diff
changeset
|
27 |
+ if (mGSettings) { |
1190 | 28 |
+ mGSettings->GetCollectionForSchema("org.gnome.system.proxy"_ns, |
29 |
+ getter_AddRefs(mProxySettings)); |
|
650 | 30 |
+ } |
1095 | 31 |
} |
0 | 32 |
} |
33 |