forked from pool/MozillaThunderbird
6c01889e00
- appdate screenshot URL updated (by mailaender@opensuse.org) - Mozilla Thunderbird 91.0 * based on Mozilla's 91 ESR codebase * many new and changed features https://www.thunderbird.net/en-US/thunderbird/91.0/releasenotes/#whatsnew * Renamed "Add-ons" to "Add-ons and Themes" and "Options" to "Preferences" * Thunderbird now operates in multi-process (e10s) mode by default * New user interface for adding attachments * Enable redirect of messages * CardDAV address book support - Removed obsolete patches: * mozilla-bmo1463035.patch * mozilla-ppc-altivec_static_inline.patch * mozilla-pipewire-0-3.patch * mozilla-bmo1554971.patch - add mozilla-libavcodec58_91.patch - removed obsolete BigEndian ICU build workaround - updated build requirements - build using clang OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=600
45 lines
1.8 KiB
Diff
45 lines
1.8 KiB
Diff
# HG changeset patch
|
|
# User Wolfgang Rosenauer
|
|
# Date 1558442915 -7200
|
|
# Tue May 21 14:48:35 2019 +0200
|
|
# Node ID 6bcf2dfebc1ea2aa34e5cc61152709fc8e409dc5
|
|
# Parent bd5d1f49975deb730064a16b3079edb53c4a5f84
|
|
Do not use gconf for proxy settings if not running within Gnome
|
|
Index: toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
|
|
===================================================================
|
|
RCS file: /cvsroot/mozilla/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp,v
|
|
retrieving revision 1.1
|
|
|
|
diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
|
|
--- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
|
|
+++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
|
|
@@ -49,20 +49,24 @@ NS_IMETHODIMP
|
|
nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) {
|
|
// dbus prevents us from being threadsafe, but this routine should not block
|
|
// anyhow
|
|
*aMainThreadOnly = true;
|
|
return NS_OK;
|
|
}
|
|
|
|
void nsUnixSystemProxySettings::Init() {
|
|
- mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID);
|
|
- if (mGSettings) {
|
|
- mGSettings->GetCollectionForSchema("org.gnome.system.proxy"_ns,
|
|
- getter_AddRefs(mProxySettings));
|
|
+ const char* sessionType = PR_GetEnv("DESKTOP_SESSION");
|
|
+ if (sessionType && !strcmp(sessionType, "gnome")) {
|
|
+ mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID);
|
|
+ if (mGSettings) {
|
|
+ mGSettings->GetCollectionForSchema(
|
|
+ "org.gnome.system.proxy"_ns,
|
|
+ getter_AddRefs(mProxySettings));
|
|
+ }
|
|
}
|
|
}
|
|
|
|
nsresult nsUnixSystemProxySettings::GetPACURI(nsACString& aResult) {
|
|
if (mProxySettings) {
|
|
nsCString proxyMode;
|
|
// Check if mode is auto
|
|
nsresult rv = mProxySettings->GetString("mode"_ns, proxyMode);
|