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 64d0c9c59c2e7f31722466406a4c13cdf5c39a6b |
6 # Parent b7a9df31234bb6342e8b01dcfa98b7d8ecdfd1dd |
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 @@ -4767,16 +4768,27 @@ nsresult Preferences::InitInitialObjects |
34 @@ -4791,16 +4792,27 @@ nsresult Preferences::InitInitialObjects |
35 "unix.js" |
35 "unix.js" |
36 # if defined(_AIX) |
36 # if defined(_AIX) |
37 , |
37 , |
38 "aix.js" |
38 "aix.js" |
39 # endif |
39 # endif |
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 // Load jar:$app/omni.jar!/defaults/preferences/*.js |
61 // or jar:$gre/omni.jar!/defaults/preferences/*.js. |
61 // or jar:$gre/omni.jar!/defaults/preferences/*.js. |
62 @@ -4841,17 +4853,17 @@ nsresult Preferences::InitInitialObjects |
62 @@ -4865,17 +4877,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; |
1243 NS_ASSERTION(!gnomeInfo->HasExtensions(), "How'd that happen?"); |
1243 NS_ASSERTION(!gnomeInfo->HasExtensions(), "How'd that happen?"); |
1244 gnomeInfo->SetFileExtensions(NS_ConvertUTF16toUTF8(extensions)); |
1244 gnomeInfo->SetFileExtensions(NS_ConvertUTF16toUTF8(extensions)); |
1245 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build |
1245 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build |
1246 --- a/widget/gtk/moz.build |
1246 --- a/widget/gtk/moz.build |
1247 +++ b/widget/gtk/moz.build |
1247 +++ b/widget/gtk/moz.build |
1248 @@ -154,16 +154,17 @@ FINAL_LIBRARY = "xul" |
1248 @@ -146,16 +146,17 @@ FINAL_LIBRARY = "xul" |
1249 |
1249 |
1250 LOCAL_INCLUDES += [ |
1250 LOCAL_INCLUDES += [ |
1251 "/layout/base", |
1251 "/layout/base", |
1252 "/layout/forms", |
1252 "/layout/forms", |
1253 "/layout/generic", |
1253 "/layout/generic", |
1787 |
1787 |
1788 if CONFIG["MOZ_BACKGROUNDTASKS"]: |
1788 if CONFIG["MOZ_BACKGROUNDTASKS"]: |
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 @@ -54,16 +54,17 @@ |
1792 @@ -46,16 +46,17 @@ |
1793 #include "prproces.h" |
1793 #include "nsString.h" |
1794 #include "nsIDirectoryEnumerator.h" |
1794 #include "nsIDirectoryEnumerator.h" |
1795 #include "nsSimpleEnumerator.h" |
1795 #include "nsSimpleEnumerator.h" |
1796 #include "private/pprio.h" |
1796 #include "private/pprio.h" |
1797 #include "prlink.h" |
1797 #include "prlink.h" |
1798 |
1798 |
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 @@ -2097,20 +2098,29 @@ nsLocalFile::SetPersistentDescriptor(con |
1810 @@ -2083,20 +2084,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 @@ -2122,16 +2132,23 @@ nsLocalFile::Reveal() { |
1842 @@ -2108,16 +2118,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; |