1 # HG changeset patch |
1 # HG changeset patch |
2 # User Wolfgang Rosenauer |
2 # User Wolfgang Rosenauer |
3 # Date 1558442915 -7200 |
3 # Date 1558442915 -7200 |
4 # Tue May 21 14:48:35 2019 +0200 |
4 # Tue May 21 14:48:35 2019 +0200 |
5 # Node ID 6bcf2dfebc1ea2aa34e5cc61152709fc8e409dc5 |
5 # Node ID 6bcf2dfebc1ea2aa34e5cc61152709fc8e409dc5 |
6 # Parent 4c434d19d03d5461e54fa22dfb82eaed4cd6631b |
6 # Parent dc1684693eed684bdafeff0ad78d4f6d288fcae1 |
7 Do not use gconf for proxy settings if not running within Gnome |
7 Do not use gconf for proxy settings if not running within Gnome |
8 Index: toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
8 Index: toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
9 =================================================================== |
9 =================================================================== |
10 RCS file: /cvsroot/mozilla/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp,v |
10 RCS file: /cvsroot/mozilla/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp,v |
11 retrieving revision 1.1 |
11 retrieving revision 1.1 |
12 |
12 |
13 diff -r 4c434d19d03d -r 6bcf2dfebc1e toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
13 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
14 --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp Wed Jun 12 17:43:18 2019 +0000 |
14 --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
15 +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp Tue May 21 14:48:35 2019 +0200 |
15 +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
16 @@ -55,11 +55,14 @@ |
16 @@ -49,21 +49,24 @@ NS_IMETHODIMP |
|
17 nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) { |
|
18 // dbus prevents us from being threadsafe, but this routine should not block |
|
19 // anyhow |
|
20 *aMainThreadOnly = true; |
|
21 return NS_OK; |
17 } |
22 } |
18 |
23 |
19 void nsUnixSystemProxySettings::Init() { |
24 void nsUnixSystemProxySettings::Init() { |
20 - mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID); |
25 - mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID); |
21 - if (mGSettings) { |
26 - if (mGSettings) { |