pool/MozillaFirefox
SHA256
13
0
Fork 1
Code Issues Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=738

Browse Source
This commit is contained in:
Wolfgang Rosenauer
2019-05-24 10:52:31 +00:00
committed by Git OBS Bridge
parent 553111b006
commit cbfad89df5
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mozilla-nongnome-proxies.patch
View File

@@ -9,7 +9,7 @@ retrieving revision 1.1
diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
--- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
+++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
@@ -57,25 +57,27 @@ NS_IMETHODIMP @@ -57,24 +57,27 @@ NS_IMETHODIMP
nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) { nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) {
// dbus prevents us from being threadsafe, but this routine should not block // dbus prevents us from being threadsafe, but this routine should not block
// anyhow // anyhow
@@ -26,7 +26,6 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
- } - }
- if (!mProxySettings) { - if (!mProxySettings) {
- mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID); - mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
- }
+ // only use GSettings if that is a GNOME session + // only use GSettings if that is a GNOME session
+ const char* sessionType = PR_GetEnv("DESKTOP_SESSION"); + const char* sessionType = PR_GetEnv("DESKTOP_SESSION");
+ if (sessionType && !strcmp(sessionType, "gnome")) { + if (sessionType && !strcmp(sessionType, "gnome")) {
@@ -38,6 +37,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
+ if (!mProxySettings) { + if (!mProxySettings) {
+ mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID); + mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
+ } + }
}
} }
bool nsUnixSystemProxySettings::IsProxyMode(const char* aMode) { bool nsUnixSystemProxySettings::IsProxyMode(const char* aMode) {
@@ -45,4 +45,3 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
return NS_SUCCEEDED(mGConf->GetString( return NS_SUCCEEDED(mGConf->GetString(
NS_LITERAL_CSTRING("/system/proxy/mode"), mode)) && NS_LITERAL_CSTRING("/system/proxy/mode"), mode)) &&
mode.EqualsASCII(aMode); mode.EqualsASCII(aMode);
}