equal
deleted
inserted
replaced
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 929fbcb071c2e1ff551c73e8c364e9c1f4495171 |
6 # Parent 53e325f006bd6a31f6f3d40ae248e4058897055a |
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 |
29 #endif |
29 #endif |
30 |
30 |
31 #ifdef MOZ_MEMORY |
31 #ifdef MOZ_MEMORY |
32 # include "mozmemory.h" |
32 # include "mozmemory.h" |
33 #endif |
33 #endif |
34 @@ -4573,25 +4574,37 @@ nsresult Preferences::InitInitialObjects |
34 @@ -4635,25 +4636,37 @@ nsresult Preferences::InitInitialObjects |
35 // application pref files for backwards compatibility. |
35 // application pref files for backwards compatibility. |
36 static const char* specialFiles[] = { |
36 static const char* specialFiles[] = { |
37 #if defined(XP_MACOSX) |
37 #if defined(XP_MACOSX) |
38 "macprefs.js" |
38 "macprefs.js" |
39 #elif defined(XP_WIN) |
39 #elif defined(XP_WIN) |
67 NS_WARNING("Error parsing application default preferences."); |
67 NS_WARNING("Error parsing application default preferences."); |
68 } |
68 } |
69 |
69 |
70 // Load jar:$app/omni.jar!/defaults/preferences/*.js |
70 // Load jar:$app/omni.jar!/defaults/preferences/*.js |
71 // or jar:$gre/omni.jar!/defaults/preferences/*.js. |
71 // or jar:$gre/omni.jar!/defaults/preferences/*.js. |
72 @@ -4656,17 +4669,17 @@ nsresult Preferences::InitInitialObjects |
72 @@ -4718,17 +4731,17 @@ nsresult Preferences::InitInitialObjects |
73 } |
73 } |
74 |
74 |
75 nsCOMPtr<nsIFile> path = do_QueryInterface(elem); |
75 nsCOMPtr<nsIFile> path = do_QueryInterface(elem); |
76 if (!path) { |
76 if (!path) { |
77 continue; |
77 continue; |
839 #endif |
839 #endif |
840 return IPC_OK(); |
840 return IPC_OK(); |
841 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build |
841 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build |
842 --- a/uriloader/exthandler/moz.build |
842 --- a/uriloader/exthandler/moz.build |
843 +++ b/uriloader/exthandler/moz.build |
843 +++ b/uriloader/exthandler/moz.build |
844 @@ -86,17 +86,19 @@ else: |
844 @@ -77,17 +77,19 @@ else: |
845 SOURCES += [ |
845 SOURCES += [ |
846 osdir + "/nsOSHelperAppService.cpp", |
846 osdir + "/nsOSHelperAppService.cpp", |
847 ] |
847 ] |
848 if CONFIG["CC_TYPE"] in ("clang", "gcc"): |
848 if CONFIG["CC_TYPE"] in ("clang", "gcc"): |
849 CXXFLAGS += ["-Wno-error=shadow"] |
849 CXXFLAGS += ["-Wno-error=shadow"] |
855 + "unix/nsKDERegistry.cpp", |
855 + "unix/nsKDERegistry.cpp", |
856 "unix/nsMIMEInfoUnix.cpp", |
856 "unix/nsMIMEInfoUnix.cpp", |
857 ] |
857 ] |
858 elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "android": |
858 elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "android": |
859 UNIFIED_SOURCES += [ |
859 UNIFIED_SOURCES += [ |
860 "android/nsAndroidHandlerApp.cpp", |
|
861 "android/nsExternalURLHandlerService.cpp", |
|
862 "android/nsMIMEInfoAndroid.cpp", |
860 "android/nsMIMEInfoAndroid.cpp", |
863 ] |
861 ] |
864 @@ -136,16 +138,17 @@ include("/ipc/chromium/chromium-config.m |
862 elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows": |
|
863 UNIFIED_SOURCES += [ |
|
864 @@ -125,16 +127,17 @@ include("/ipc/chromium/chromium-config.m |
865 FINAL_LIBRARY = "xul" |
865 FINAL_LIBRARY = "xul" |
866 |
866 |
867 LOCAL_INCLUDES += [ |
867 LOCAL_INCLUDES += [ |
868 "/docshell/base", |
868 "/docshell/base", |
869 "/dom/base", |
869 "/dom/base", |
1835 |
1835 |
1836 if CONFIG["MOZ_BACKGROUNDTASKS"]: |
1836 if CONFIG["MOZ_BACKGROUNDTASKS"]: |
1837 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp |
1837 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp |
1838 --- a/xpcom/io/nsLocalFileUnix.cpp |
1838 --- a/xpcom/io/nsLocalFileUnix.cpp |
1839 +++ b/xpcom/io/nsLocalFileUnix.cpp |
1839 +++ b/xpcom/io/nsLocalFileUnix.cpp |
1840 @@ -49,16 +49,17 @@ |
1840 @@ -53,16 +53,17 @@ |
1841 #include "prproces.h" |
1841 #include "prproces.h" |
1842 #include "nsIDirectoryEnumerator.h" |
1842 #include "nsIDirectoryEnumerator.h" |
1843 #include "nsSimpleEnumerator.h" |
1843 #include "nsSimpleEnumerator.h" |
1844 #include "private/pprio.h" |
1844 #include "private/pprio.h" |
1845 #include "prlink.h" |
1845 #include "prlink.h" |
1853 # include <Carbon/Carbon.h> |
1853 # include <Carbon/Carbon.h> |
1854 # include "CocoaFileUtils.h" |
1854 # include "CocoaFileUtils.h" |
1855 # include "prmem.h" |
1855 # include "prmem.h" |
1856 # include "plbase64.h" |
1856 # include "plbase64.h" |
1857 |
1857 |
1858 @@ -2001,62 +2002,77 @@ nsLocalFile::SetPersistentDescriptor(con |
1858 @@ -2021,62 +2022,77 @@ nsLocalFile::SetPersistentDescriptor(con |
1859 |
1859 |
1860 NS_IMETHODIMP |
1860 NS_IMETHODIMP |
1861 nsLocalFile::Reveal() { |
1861 nsLocalFile::Reveal() { |
1862 if (!FilePreferences::IsAllowedPath(mPath)) { |
1862 if (!FilePreferences::IsAllowedPath(mPath)) { |
1863 return NS_ERROR_FILE_ACCESS_DENIED; |
1863 return NS_ERROR_FILE_ACCESS_DENIED; |
1936 return NS_ERROR_FAILURE; |
1936 return NS_ERROR_FAILURE; |
1937 } |
1937 } |
1938 |
1938 |
1939 return giovfs->ShowURIForInput(mPath); |
1939 return giovfs->ShowURIForInput(mPath); |
1940 #elif defined(MOZ_WIDGET_ANDROID) |
1940 #elif defined(MOZ_WIDGET_ANDROID) |
1941 // Try to get a mimetype, if this fails just use the file uri alone |
1941 // Not supported on GeckoView |