author | Wolfgang Rosenauer <wr@rosenauer.org> |
Mon, 25 Nov 2019 08:30:26 +0100 | |
changeset 1115 | ed3548a16248 |
parent 1097 | 840132a4a9b3 |
child 1123 | 7fa561e5d7c7 |
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 |
|
6 |
# Parent 4c434d19d03d5461e54fa22dfb82eaed4cd6631b |
|
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 |
|
1097 | 13 |
diff -r 4c434d19d03d -r 6bcf2dfebc1e toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
14 |
--- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp Wed Jun 12 17:43:18 2019 +0000 |
|
15 |
+++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp Tue May 21 14:48:35 2019 +0200 |
|
16 |
@@ -55,11 +55,14 @@ |
|
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) { |
1085 | 22 |
- mGSettings->GetCollectionForSchema( |
23 |
- NS_LITERAL_CSTRING("org.gnome.system.proxy"), |
|
24 |
- getter_AddRefs(mProxySettings)); |
|
0 | 25 |
+ const char* sessionType = PR_GetEnv("DESKTOP_SESSION"); |
26 |
+ if (sessionType && !strcmp(sessionType, "gnome")) { |
|
382
67f876aafae8
lift up to Gecko 11beta
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
27 |
+ mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID); |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
382
diff
changeset
|
28 |
+ if (mGSettings) { |
1097 | 29 |
+ mGSettings->GetCollectionForSchema( |
30 |
+ NS_LITERAL_CSTRING("org.gnome.system.proxy"), |
|
31 |
+ getter_AddRefs(mProxySettings)); |
|
650 | 32 |
+ } |
1095 | 33 |
} |
0 | 34 |
} |
35 |