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 eeedc49c16aba3b50d1547315a88091a1c765904 |
6 # Parent edd7284c391b503b76bb5bb6321f24ab2f5f8bdf |
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 |
163 with Files("**"): |
163 with Files("**"): |
164 BUG_COMPONENT = ("Toolkit", "Downloads API") |
164 BUG_COMPONENT = ("Toolkit", "Downloads API") |
165 diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downloads/HelperAppDlg.jsm |
165 diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downloads/HelperAppDlg.jsm |
166 --- a/toolkit/mozapps/downloads/HelperAppDlg.jsm |
166 --- a/toolkit/mozapps/downloads/HelperAppDlg.jsm |
167 +++ b/toolkit/mozapps/downloads/HelperAppDlg.jsm |
167 +++ b/toolkit/mozapps/downloads/HelperAppDlg.jsm |
168 @@ -1252,36 +1252,66 @@ nsUnknownContentTypeDialog.prototype = { |
168 @@ -1254,36 +1254,66 @@ nsUnknownContentTypeDialog.prototype = { |
169 params.handlerApp && |
169 params.handlerApp && |
170 params.handlerApp.executable && |
170 params.handlerApp.executable && |
171 params.handlerApp.executable.isFile() |
171 params.handlerApp.executable.isFile() |
172 ) { |
172 ) { |
173 // Remember the file they chose to run. |
173 // Remember the file they chose to run. |
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 @@ -13,16 +13,17 @@ |
258 @@ -10,16 +10,17 @@ |
259 #include "nsPrintfCString.h" |
259 #include "prnetdb.h" |
260 #include "nsNetCID.h" |
260 #include "prenv.h" |
|
261 #include "nsInterfaceHashtable.h" |
|
262 #include "nsHashtablesFwd.h" |
|
263 #include "nsHashKeys.h" |
261 #include "nsNetUtil.h" |
264 #include "nsNetUtil.h" |
262 #include "nsISupportsPrimitives.h" |
265 #include "nsISupportsPrimitives.h" |
263 #include "nsIGSettingsService.h" |
266 #include "nsIGSettingsService.h" |
264 #include "nsInterfaceHashtable.h" |
|
265 #include "mozilla/Attributes.h" |
|
266 #include "nsIURI.h" |
|
267 +#include "nsKDEUtils.h" |
267 +#include "nsKDEUtils.h" |
268 |
268 |
269 using namespace mozilla; |
269 using namespace mozilla; |
270 |
270 |
271 class nsUnixSystemProxySettings final : public nsISystemProxySettings { |
271 class nsUnixSystemProxySettings final : public nsISystemProxySettings { |
272 public: |
272 public: |
273 NS_DECL_ISUPPORTS |
273 NS_DECL_ISUPPORTS |
274 NS_DECL_NSISYSTEMPROXYSETTINGS |
274 NS_DECL_NSISYSTEMPROXYSETTINGS |
275 |
275 |
276 @@ -36,16 +37,18 @@ class nsUnixSystemProxySettings final : |
276 @@ -33,16 +34,18 @@ class nsUnixSystemProxySettings final : |
277 nsCOMPtr<nsIGSettingsCollection> mProxySettings; |
277 nsCOMPtr<nsIGSettingsCollection> mProxySettings; |
278 nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection> |
278 nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection> |
279 mSchemeProxySettings; |
279 mSchemeProxySettings; |
280 nsresult GetProxyFromGSettings(const nsACString& aScheme, |
280 nsresult GetProxyFromGSettings(const nsACString& aScheme, |
281 const nsACString& aHost, int32_t aPort, |
281 const nsACString& aHost, int32_t aPort, |
290 |
290 |
291 NS_IMETHODIMP |
291 NS_IMETHODIMP |
292 nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) { |
292 nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) { |
293 // dbus prevents us from being threadsafe, but this routine should not block |
293 // dbus prevents us from being threadsafe, but this routine should not block |
294 // anyhow |
294 // anyhow |
295 @@ -381,21 +384,50 @@ nsresult nsUnixSystemProxySettings::GetP |
295 @@ -378,21 +381,50 @@ nsresult nsUnixSystemProxySettings::GetP |
296 return NS_OK; |
296 return NS_OK; |
297 } |
297 } |
298 |
298 |
299 nsresult nsUnixSystemProxySettings::GetProxyForURI(const nsACString& aSpec, |
299 nsresult nsUnixSystemProxySettings::GetProxyForURI(const nsACString& aSpec, |
300 const nsACString& aScheme, |
300 const nsACString& aScheme, |
784 return IPC_OK(); |
784 return IPC_OK(); |
785 } |
785 } |
786 |
786 |
787 /* |
787 /* |
788 * Check if a handler exists for the provided protocol. Check the datastore |
788 * Check if a handler exists for the provided protocol. Check the datastore |
789 @@ -328,17 +328,17 @@ mozilla::ipc::IPCResult HandlerServicePa |
|
790 nsCOMPtr<nsIExternalProtocolService> protoSvc = |
|
791 do_GetService(NS_EXTERNALPROTOCOLSERVICE_CONTRACTID, &rv); |
|
792 if (NS_WARN_IF(NS_FAILED(rv))) { |
|
793 *aHandlerExists = false; |
|
794 return IPC_OK(); |
|
795 } |
|
796 rv = protoSvc->ExternalProtocolHandlerExists(aProtocolScheme.get(), |
|
797 aHandlerExists); |
|
798 - |
|
799 +## |
|
800 if (NS_WARN_IF(NS_FAILED(rv))) { |
|
801 *aHandlerExists = false; |
|
802 } |
|
803 #else |
|
804 MOZ_RELEASE_ASSERT(false, "No implementation on this platform."); |
|
805 *aHandlerExists = false; |
|
806 #endif |
|
807 return IPC_OK(); |
|
808 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build |
789 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build |
809 --- a/uriloader/exthandler/moz.build |
790 --- a/uriloader/exthandler/moz.build |
810 +++ b/uriloader/exthandler/moz.build |
791 +++ b/uriloader/exthandler/moz.build |
811 @@ -78,17 +78,19 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "ui |
792 @@ -78,17 +78,19 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "ui |
812 else: |
793 else: |
1823 # include <Carbon/Carbon.h> |
1804 # include <Carbon/Carbon.h> |
1824 # include "CocoaFileUtils.h" |
1805 # include "CocoaFileUtils.h" |
1825 # include "prmem.h" |
1806 # include "prmem.h" |
1826 # include "plbase64.h" |
1807 # include "plbase64.h" |
1827 |
1808 |
1828 @@ -2071,20 +2072,29 @@ nsLocalFile::SetPersistentDescriptor(con |
1809 @@ -2097,20 +2098,29 @@ nsLocalFile::SetPersistentDescriptor(con |
1829 |
1810 |
1830 NS_IMETHODIMP |
1811 NS_IMETHODIMP |
1831 nsLocalFile::Reveal() { |
1812 nsLocalFile::Reveal() { |
1832 if (!FilePreferences::IsAllowedPath(mPath)) { |
1813 if (!FilePreferences::IsAllowedPath(mPath)) { |
1833 return NS_ERROR_FILE_ACCESS_DENIED; |
1814 return NS_ERROR_FILE_ACCESS_DENIED; |
1855 if (NS_SUCCEEDED(GetCFURL(&url))) { |
1836 if (NS_SUCCEEDED(GetCFURL(&url))) { |
1856 nsresult rv = CocoaFileUtils::RevealFileInFinder(url); |
1837 nsresult rv = CocoaFileUtils::RevealFileInFinder(url); |
1857 ::CFRelease(url); |
1838 ::CFRelease(url); |
1858 return rv; |
1839 return rv; |
1859 } |
1840 } |
1860 @@ -2096,16 +2106,23 @@ nsLocalFile::Reveal() { |
1841 @@ -2122,16 +2132,23 @@ nsLocalFile::Reveal() { |
1861 |
1842 |
1862 NS_IMETHODIMP |
1843 NS_IMETHODIMP |
1863 nsLocalFile::Launch() { |
1844 nsLocalFile::Launch() { |
1864 if (!FilePreferences::IsAllowedPath(mPath)) { |
1845 if (!FilePreferences::IsAllowedPath(mPath)) { |
1865 return NS_ERROR_FILE_ACCESS_DENIED; |
1846 return NS_ERROR_FILE_ACCESS_DENIED; |