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 e8919158faed3f4a08289fb293dd87ce56bdcc4d |
6 # Parent a6ee87356867ce6ed5b0be1ba2c2690a488beb55 |
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 |
12 |
12 |
13 diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp |
13 diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp |
14 --- a/modules/libpref/Preferences.cpp |
14 --- a/modules/libpref/Preferences.cpp |
15 +++ b/modules/libpref/Preferences.cpp |
15 +++ b/modules/libpref/Preferences.cpp |
16 @@ -89,16 +89,17 @@ |
16 @@ -90,16 +90,17 @@ |
17 #include "PLDHashTable.h" |
|
18 #include "plstr.h" |
17 #include "plstr.h" |
|
18 #include "prdtoa.h" |
19 #include "prlink.h" |
19 #include "prlink.h" |
20 #include "xpcpublic.h" |
20 #include "xpcpublic.h" |
21 #include "js/RootingAPI.h" |
21 #include "js/RootingAPI.h" |
22 #ifdef MOZ_BACKGROUNDTASKS |
22 #ifdef MOZ_BACKGROUNDTASKS |
23 # include "mozilla/BackgroundTasks.h" |
23 # include "mozilla/BackgroundTasks.h" |
57 NS_WARNING("Error parsing application default preferences."); |
57 NS_WARNING("Error parsing application default preferences."); |
58 } |
58 } |
59 |
59 |
60 #if defined(MOZ_WIDGET_GTK) |
60 #if defined(MOZ_WIDGET_GTK) |
61 // Under Flatpak/Snap package, load /etc/firefox/defaults/pref/*.js. |
61 // Under Flatpak/Snap package, load /etc/firefox/defaults/pref/*.js. |
62 @@ -4938,17 +4950,17 @@ nsresult Preferences::InitInitialObjects |
62 @@ -4969,17 +4981,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; |
788 /* |
788 /* |
789 * Check if a handler exists for the provided protocol. Check the datastore |
789 * Check if a handler exists for the provided protocol. Check the datastore |
790 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build |
790 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build |
791 --- a/uriloader/exthandler/moz.build |
791 --- a/uriloader/exthandler/moz.build |
792 +++ b/uriloader/exthandler/moz.build |
792 +++ b/uriloader/exthandler/moz.build |
793 @@ -78,17 +78,19 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "ui |
793 @@ -81,17 +81,19 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "ui |
794 else: |
794 else: |
795 # These files can't be built in unified mode because they redefine LOG. |
795 # These files can't be built in unified mode because they redefine LOG. |
796 SOURCES += [ |
796 SOURCES += [ |
797 osdir + "/nsOSHelperAppService.cpp", |
797 osdir + "/nsOSHelperAppService.cpp", |
798 ] |
798 ] |
808 UNIFIED_SOURCES += [ |
808 UNIFIED_SOURCES += [ |
809 "android/nsMIMEInfoAndroid.cpp", |
809 "android/nsMIMEInfoAndroid.cpp", |
810 ] |
810 ] |
811 elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows": |
811 elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows": |
812 UNIFIED_SOURCES += [ |
812 UNIFIED_SOURCES += [ |
813 @@ -126,16 +128,17 @@ include("/ipc/chromium/chromium-config.m |
813 @@ -129,16 +131,17 @@ include("/ipc/chromium/chromium-config.m |
814 FINAL_LIBRARY = "xul" |
814 FINAL_LIBRARY = "xul" |
815 |
815 |
816 LOCAL_INCLUDES += [ |
816 LOCAL_INCLUDES += [ |
817 "/docshell/base", |
817 "/docshell/base", |
818 "/dom/base", |
818 "/dom/base", |
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 @@ -2094,20 +2095,29 @@ nsLocalFile::SetPersistentDescriptor(con |
1810 @@ -2157,20 +2158,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 @@ -2119,16 +2129,23 @@ nsLocalFile::Reveal() { |
1842 @@ -2182,16 +2192,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; |