1 # HG changeset patch |
1 # HG changeset patch |
2 # User msirringhaus@suse.de |
2 # User msirringhaus@suse.de |
3 # Date 1559294891 -7200 |
3 # Date 1559294891 -7200 |
4 # Fri May 31 11:28:11 2019 +0200 |
4 # Fri May 31 11:28:11 2019 +0200 |
5 # Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112 |
5 # Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112 |
6 # Parent edd7284c391b503b76bb5bb6321f24ab2f5f8bdf |
6 # Parent 64d0c9c59c2e7f31722466406a4c13cdf5c39a6b |
7 Description: Add KDE integration to Firefox (toolkit parts) |
7 Description: Add KDE integration to Firefox (toolkit parts) |
8 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org> |
8 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org> |
9 Author: Lubos Lunak <lunak@suse.com> |
9 Author: Lubos Lunak <lunak@suse.com> |
10 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751 |
10 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751 |
11 https://bugzilla.novell.com/show_bug.cgi?id=170055 |
11 https://bugzilla.novell.com/show_bug.cgi?id=170055 |
253 nsIFilePicker.modeOpen |
253 nsIFilePicker.modeOpen |
254 ); |
254 ); |
255 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
255 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
256 --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
256 --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
257 +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
257 +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
258 @@ -10,16 +10,17 @@ |
258 @@ -10,16 +10,18 @@ |
259 #include "prnetdb.h" |
259 #include "prnetdb.h" |
260 #include "prenv.h" |
260 #include "prenv.h" |
261 #include "nsInterfaceHashtable.h" |
261 #include "nsInterfaceHashtable.h" |
262 #include "nsHashtablesFwd.h" |
262 #include "nsHashtablesFwd.h" |
263 #include "nsHashKeys.h" |
263 #include "nsHashKeys.h" |
264 #include "nsNetUtil.h" |
264 #include "nsNetUtil.h" |
265 #include "nsISupportsPrimitives.h" |
265 #include "nsISupportsPrimitives.h" |
266 #include "nsIGSettingsService.h" |
266 #include "nsIGSettingsService.h" |
|
267 +#include "nsPrintfCString.h" |
267 +#include "nsKDEUtils.h" |
268 +#include "nsKDEUtils.h" |
268 |
269 |
269 using namespace mozilla; |
270 using namespace mozilla; |
270 |
271 |
271 class nsUnixSystemProxySettings final : public nsISystemProxySettings { |
272 class nsUnixSystemProxySettings final : public nsISystemProxySettings { |
272 public: |
273 public: |
273 NS_DECL_ISUPPORTS |
274 NS_DECL_ISUPPORTS |
274 NS_DECL_NSISYSTEMPROXYSETTINGS |
275 NS_DECL_NSISYSTEMPROXYSETTINGS |
275 |
276 |
276 @@ -33,16 +34,18 @@ class nsUnixSystemProxySettings final : |
277 @@ -33,16 +35,18 @@ class nsUnixSystemProxySettings final : |
277 nsCOMPtr<nsIGSettingsCollection> mProxySettings; |
278 nsCOMPtr<nsIGSettingsCollection> mProxySettings; |
278 nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection> |
279 nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection> |
279 mSchemeProxySettings; |
280 mSchemeProxySettings; |
280 nsresult GetProxyFromGSettings(const nsACString& aScheme, |
281 nsresult GetProxyFromGSettings(const nsACString& aScheme, |
281 const nsACString& aHost, int32_t aPort, |
282 const nsACString& aHost, int32_t aPort, |
290 |
291 |
291 NS_IMETHODIMP |
292 NS_IMETHODIMP |
292 nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) { |
293 nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) { |
293 // dbus prevents us from being threadsafe, but this routine should not block |
294 // dbus prevents us from being threadsafe, but this routine should not block |
294 // anyhow |
295 // anyhow |
295 @@ -378,21 +381,50 @@ nsresult nsUnixSystemProxySettings::GetP |
296 @@ -378,21 +382,50 @@ nsresult nsUnixSystemProxySettings::GetP |
296 return NS_OK; |
297 return NS_OK; |
297 } |
298 } |
298 |
299 |
299 nsresult nsUnixSystemProxySettings::GetProxyForURI(const nsACString& aSpec, |
300 nsresult nsUnixSystemProxySettings::GetProxyForURI(const nsACString& aSpec, |
300 const nsACString& aScheme, |
301 const nsACString& aScheme, |