19beb5ecdd
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/seamonkey?expand=0&rev=67
26 lines
1.2 KiB
Diff
26 lines
1.2 KiB
Diff
From: Wolfgang Rosenauer, Tristan Miller
|
|
Subject: Do not use gconf for proxy settings if not running within Gnome
|
|
|
|
diff -ruN seamonkey-2.53.17b1.orig/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp seamonkey-2.53.17b1/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
|
|
--- seamonkey-2.53.17b1.orig/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp 2023-06-10 12:41:26.000000000 +0200
|
|
+++ seamonkey-2.53.17b1/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp 2023-07-12 09:41:08.047344985 +0200
|
|
@@ -55,10 +55,14 @@
|
|
nsresult
|
|
nsUnixSystemProxySettings::Init()
|
|
{
|
|
- mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID);
|
|
- if (mGSettings) {
|
|
- mGSettings->GetCollectionForSchema(NS_LITERAL_CSTRING("org.gnome.system.proxy"),
|
|
- getter_AddRefs(mProxySettings));
|
|
+ // only use GSettings if that is a GNOME session
|
|
+ const char* sessionType = PR_GetEnv("DESKTOP_SESSION");
|
|
+ if (sessionType && !strcmp(sessionType, "gnome")) {
|
|
+ mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID);
|
|
+ if (mGSettings) {
|
|
+ mGSettings->GetCollectionForSchema(NS_LITERAL_CSTRING("org.gnome.system.proxy"),
|
|
+ getter_AddRefs(mProxySettings));
|
|
+ }
|
|
}
|
|
|
|
return NS_OK;
|