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 36f9c3a81777563ef87663a210b1cd38fdd734d9 |
6 # Parent e8919158faed3f4a08289fb293dd87ce56bdcc4d |
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 |
55 ArrayLength(specialFiles)); |
55 ArrayLength(specialFiles)); |
56 if (NS_FAILED(rv)) { |
56 if (NS_FAILED(rv)) { |
57 NS_WARNING("Error parsing application default preferences."); |
57 NS_WARNING("Error parsing application default preferences."); |
58 } |
58 } |
59 |
59 |
60 // Load jar:$app/omni.jar!/defaults/preferences/*.js |
60 #if defined(MOZ_WIDGET_GTK) |
61 // or jar:$gre/omni.jar!/defaults/preferences/*.js. |
61 // Under Flatpak/Snap package, load /etc/firefox/defaults/pref/*.js. |
62 @@ -4923,17 +4935,17 @@ nsresult Preferences::InitInitialObjects |
62 @@ -4938,17 +4950,17 @@ nsresult Preferences::InitInitialObjects |
63 } |
63 } |
64 |
64 |
65 nsCOMPtr<nsIFile> path = do_QueryInterface(elem); |
65 nsCOMPtr<nsIFile> path = do_QueryInterface(elem); |
66 if (!path) { |
66 if (!path) { |
67 continue; |
67 continue; |
79 |
79 |
80 if (aIsStartup) { |
80 if (aIsStartup) { |
81 diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build |
81 diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build |
82 --- a/modules/libpref/moz.build |
82 --- a/modules/libpref/moz.build |
83 +++ b/modules/libpref/moz.build |
83 +++ b/modules/libpref/moz.build |
84 @@ -123,16 +123,20 @@ EXPORTS.mozilla += [ |
84 @@ -122,16 +122,20 @@ EXPORTS.mozilla += [ |
85 ] |
85 ] |
86 EXPORTS.mozilla += sorted(["!" + g for g in gen_h]) |
86 EXPORTS.mozilla += sorted(["!" + g for g in gen_h]) |
87 |
87 |
88 UNIFIED_SOURCES += [ |
88 UNIFIED_SOURCES += [ |
89 "Preferences.cpp", |
89 "Preferences.cpp", |
149 +++ b/toolkit/components/downloads/moz.build |
149 +++ b/toolkit/components/downloads/moz.build |
150 @@ -46,10 +46,14 @@ XPCOM_MANIFESTS += [ |
150 @@ -46,10 +46,14 @@ XPCOM_MANIFESTS += [ |
151 |
151 |
152 if CONFIG["MOZ_PLACES"]: |
152 if CONFIG["MOZ_PLACES"]: |
153 EXTRA_JS_MODULES += [ |
153 EXTRA_JS_MODULES += [ |
154 "DownloadHistory.jsm", |
154 "DownloadHistory.sys.mjs", |
155 ] |
155 ] |
156 |
156 |
157 FINAL_LIBRARY = "xul" |
157 FINAL_LIBRARY = "xul" |
158 |
158 |
159 +LOCAL_INCLUDES += [ |
159 +LOCAL_INCLUDES += [ |
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,18 @@ |
258 @@ -11,16 +11,18 @@ |
259 #include "prnetdb.h" |
|
260 #include "prenv.h" |
259 #include "prenv.h" |
261 #include "nsInterfaceHashtable.h" |
260 #include "nsInterfaceHashtable.h" |
262 #include "nsHashtablesFwd.h" |
261 #include "nsHashtablesFwd.h" |
263 #include "nsHashKeys.h" |
262 #include "nsHashKeys.h" |
264 #include "nsNetUtil.h" |
263 #include "nsNetUtil.h" |
265 #include "nsISupportsPrimitives.h" |
264 #include "nsISupportsPrimitives.h" |
266 #include "nsIGSettingsService.h" |
265 #include "nsIGSettingsService.h" |
|
266 #include "nsReadableUtils.h" |
267 +#include "nsPrintfCString.h" |
267 +#include "nsPrintfCString.h" |
268 +#include "nsKDEUtils.h" |
268 +#include "nsKDEUtils.h" |
269 |
269 |
270 using namespace mozilla; |
270 using namespace mozilla; |
271 |
271 |
272 class nsUnixSystemProxySettings final : public nsISystemProxySettings { |
272 class nsUnixSystemProxySettings final : public nsISystemProxySettings { |
273 public: |
273 public: |
274 NS_DECL_ISUPPORTS |
274 NS_DECL_ISUPPORTS |
275 NS_DECL_NSISYSTEMPROXYSETTINGS |
275 NS_DECL_NSISYSTEMPROXYSETTINGS |
276 |
276 |
277 @@ -33,16 +35,18 @@ class nsUnixSystemProxySettings final : |
277 @@ -34,16 +36,18 @@ class nsUnixSystemProxySettings final : |
278 nsCOMPtr<nsIGSettingsCollection> mProxySettings; |
278 nsCOMPtr<nsIGSettingsCollection> mProxySettings; |
279 nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection> |
279 nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection> |
280 mSchemeProxySettings; |
280 mSchemeProxySettings; |
281 nsresult GetProxyFromGSettings(const nsACString& aScheme, |
281 nsresult GetProxyFromGSettings(const nsACString& aScheme, |
282 const nsACString& aHost, int32_t aPort, |
282 const nsACString& aHost, int32_t aPort, |
291 |
291 |
292 NS_IMETHODIMP |
292 NS_IMETHODIMP |
293 nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) { |
293 nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) { |
294 // 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 |
295 // anyhow |
295 // anyhow |
296 @@ -378,21 +382,50 @@ nsresult nsUnixSystemProxySettings::GetP |
296 @@ -392,21 +396,50 @@ nsresult nsUnixSystemProxySettings::GetP |
297 return NS_OK; |
297 return NS_OK; |
298 } |
298 } |
299 |
299 |
300 nsresult nsUnixSystemProxySettings::GetProxyForURI(const nsACString& aSpec, |
300 nsresult nsUnixSystemProxySettings::GetProxyForURI(const nsACString& aSpec, |
301 const nsACString& aScheme, |
301 const nsACString& aScheme, |
1783 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": |
1783 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": |
1784 CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] |
1784 CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] |
1785 if CONFIG["MOZ_ENABLE_DBUS"]: |
1785 if CONFIG["MOZ_ENABLE_DBUS"]: |
1786 CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"] |
1786 CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"] |
1787 |
1787 |
1788 if CONFIG["MOZ_BACKGROUNDTASKS"]: |
1788 include("/ipc/chromium/chromium-config.mozbuild") |
1789 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp |
1789 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp |
1790 --- a/xpcom/io/nsLocalFileUnix.cpp |
1790 --- a/xpcom/io/nsLocalFileUnix.cpp |
1791 +++ b/xpcom/io/nsLocalFileUnix.cpp |
1791 +++ b/xpcom/io/nsLocalFileUnix.cpp |
1792 @@ -46,16 +46,17 @@ |
1792 @@ -46,16 +46,17 @@ |
1793 #include "nsString.h" |
1793 #include "nsString.h" |
1805 # include <Carbon/Carbon.h> |
1805 # include <Carbon/Carbon.h> |
1806 # include "CocoaFileUtils.h" |
1806 # include "CocoaFileUtils.h" |
1807 # include "prmem.h" |
1807 # include "prmem.h" |
1808 # include "plbase64.h" |
1808 # include "plbase64.h" |
1809 |
1809 |
1810 @@ -2088,20 +2089,29 @@ nsLocalFile::SetPersistentDescriptor(con |
1810 @@ -2094,20 +2095,29 @@ nsLocalFile::SetPersistentDescriptor(con |
1811 |
1811 |
1812 NS_IMETHODIMP |
1812 NS_IMETHODIMP |
1813 nsLocalFile::Reveal() { |
1813 nsLocalFile::Reveal() { |
1814 if (!FilePreferences::IsAllowedPath(mPath)) { |
1814 if (!FilePreferences::IsAllowedPath(mPath)) { |
1815 return NS_ERROR_FILE_ACCESS_DENIED; |
1815 return NS_ERROR_FILE_ACCESS_DENIED; |
1837 if (NS_SUCCEEDED(GetCFURL(&url))) { |
1837 if (NS_SUCCEEDED(GetCFURL(&url))) { |
1838 nsresult rv = CocoaFileUtils::RevealFileInFinder(url); |
1838 nsresult rv = CocoaFileUtils::RevealFileInFinder(url); |
1839 ::CFRelease(url); |
1839 ::CFRelease(url); |
1840 return rv; |
1840 return rv; |
1841 } |
1841 } |
1842 @@ -2113,16 +2123,23 @@ nsLocalFile::Reveal() { |
1842 @@ -2119,16 +2129,23 @@ nsLocalFile::Reveal() { |
1843 |
1843 |
1844 NS_IMETHODIMP |
1844 NS_IMETHODIMP |
1845 nsLocalFile::Launch() { |
1845 nsLocalFile::Launch() { |
1846 if (!FilePreferences::IsAllowedPath(mPath)) { |
1846 if (!FilePreferences::IsAllowedPath(mPath)) { |
1847 return NS_ERROR_FILE_ACCESS_DENIED; |
1847 return NS_ERROR_FILE_ACCESS_DENIED; |