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 9db1669be16001a48b62d147070fb75f60bac251 |
6 # Parent 8d1110b6918acc4e7d3f655d1e55f4b4ff630abe |
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 @@ -4635,16 +4636,27 @@ nsresult Preferences::InitInitialObjects |
34 @@ -4634,16 +4635,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 @@ -4709,17 +4721,17 @@ nsresult Preferences::InitInitialObjects |
62 @@ -4708,17 +4720,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 @@ -119,16 +119,20 @@ EXPORTS.mozilla += [ |
84 @@ -118,16 +118,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", |
145 self.base = base |
145 self.base = base |
146 self.flags = Flags(*flags) |
146 self.flags = Flags(*flags) |
147 diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build |
147 diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build |
148 --- a/toolkit/components/downloads/moz.build |
148 --- a/toolkit/components/downloads/moz.build |
149 +++ b/toolkit/components/downloads/moz.build |
149 +++ b/toolkit/components/downloads/moz.build |
150 @@ -45,10 +45,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.jsm", |
155 ] |
155 ] |
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 @@ -1231,36 +1231,66 @@ nsUnknownContentTypeDialog.prototype = { |
168 @@ -1252,36 +1252,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. |
839 "/netwerk/protocol/http", |
839 "/netwerk/protocol/http", |
840 + "/toolkit/xre", |
840 + "/toolkit/xre", |
841 ] |
841 ] |
842 |
842 |
843 if CONFIG["MOZ_ENABLE_DBUS"]: |
843 if CONFIG["MOZ_ENABLE_DBUS"]: |
844 CXXFLAGS += CONFIG["TK_CFLAGS"] |
|
845 CXXFLAGS += CONFIG["MOZ_DBUS_CFLAGS"] |
844 CXXFLAGS += CONFIG["MOZ_DBUS_CFLAGS"] |
846 |
845 |
847 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": |
846 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": |
848 CXXFLAGS += CONFIG["TK_CFLAGS"] |
847 CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] |
|
848 CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"] |
849 diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp |
849 diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp |
850 new file mode 100644 |
850 new file mode 100644 |
851 --- /dev/null |
851 --- /dev/null |
852 +++ b/uriloader/exthandler/unix/nsCommonRegistry.cpp |
852 +++ b/uriloader/exthandler/unix/nsCommonRegistry.cpp |
853 @@ -0,0 +1,53 @@ |
853 @@ -0,0 +1,53 @@ |
1258 NS_ASSERTION(!gnomeInfo->HasExtensions(), "How'd that happen?"); |
1258 NS_ASSERTION(!gnomeInfo->HasExtensions(), "How'd that happen?"); |
1259 gnomeInfo->SetFileExtensions(NS_ConvertUTF16toUTF8(extensions)); |
1259 gnomeInfo->SetFileExtensions(NS_ConvertUTF16toUTF8(extensions)); |
1260 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build |
1260 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build |
1261 --- a/widget/gtk/moz.build |
1261 --- a/widget/gtk/moz.build |
1262 +++ b/widget/gtk/moz.build |
1262 +++ b/widget/gtk/moz.build |
1263 @@ -135,16 +135,17 @@ FINAL_LIBRARY = "xul" |
1263 @@ -136,16 +136,17 @@ FINAL_LIBRARY = "xul" |
1264 |
1264 |
1265 LOCAL_INCLUDES += [ |
1265 LOCAL_INCLUDES += [ |
1266 "/layout/base", |
1266 "/layout/base", |
1267 "/layout/forms", |
1267 "/layout/forms", |
1268 "/layout/generic", |
1268 "/layout/generic", |
1315 # include "mozilla/Logging.h" |
1315 # include "mozilla/Logging.h" |
1316 # include "nsTArray.h" |
1316 # include "nsTArray.h" |
1317 # include "Units.h" |
1317 # include "Units.h" |
1318 extern mozilla::LazyLogModule gWidgetLog; |
1318 extern mozilla::LazyLogModule gWidgetLog; |
1319 # define LOG(args) MOZ_LOG(gWidgetLog, mozilla::LogLevel::Debug, args) |
1319 # define LOG(args) MOZ_LOG(gWidgetLog, mozilla::LogLevel::Debug, args) |
1320 @@ -242,17 +245,19 @@ nsFilePicker::AppendFilters(int32_t aFil |
1320 @@ -236,17 +239,19 @@ nsFilePicker::AppendFilters(int32_t aFil |
1321 mAllowURLs = !!(aFilterMask & filterAllowURLs); |
1321 mAllowURLs = !!(aFilterMask & filterAllowURLs); |
1322 return nsBaseFilePicker::AppendFilters(aFilterMask); |
1322 return nsBaseFilePicker::AppendFilters(aFilterMask); |
1323 } |
1323 } |
1324 |
1324 |
1325 NS_IMETHODIMP |
1325 NS_IMETHODIMP |
1336 CopyUTF16toUTF8(aFilter, filter); |
1336 CopyUTF16toUTF8(aFilter, filter); |
1337 CopyUTF16toUTF8(aTitle, name); |
1337 CopyUTF16toUTF8(aTitle, name); |
1338 |
1338 |
1339 mFilters.AppendElement(filter); |
1339 mFilters.AppendElement(filter); |
1340 mFilterNames.AppendElement(name); |
1340 mFilterNames.AppendElement(name); |
1341 @@ -352,16 +357,39 @@ nsresult nsFilePicker::Show(int16_t* aRe |
1341 @@ -346,16 +351,39 @@ nsresult nsFilePicker::Show(int16_t* aRe |
1342 return NS_OK; |
1342 return NS_OK; |
1343 } |
1343 } |
1344 |
1344 |
1345 NS_IMETHODIMP |
1345 NS_IMETHODIMP |
1346 nsFilePicker::Open(nsIFilePickerShownCallback* aCallback) { |
1346 nsFilePicker::Open(nsIFilePickerShownCallback* aCallback) { |
1376 GTK_WINDOW(mParentWidget->GetNativeData(NS_NATIVE_SHELLWIDGET)); |
1376 GTK_WINDOW(mParentWidget->GetNativeData(NS_NATIVE_SHELLWIDGET)); |
1377 |
1377 |
1378 GtkFileChooserAction action = GetGtkFileChooserAction(mMode); |
1378 GtkFileChooserAction action = GetGtkFileChooserAction(mMode); |
1379 |
1379 |
1380 const gchar* accept_button; |
1380 const gchar* accept_button; |
1381 @@ -581,16 +609,244 @@ void nsFilePicker::Done(void* file_choos |
1381 @@ -575,16 +603,244 @@ void nsFilePicker::Done(void* file_choos |
1382 mCallback->Done(result); |
1382 mCallback->Done(result); |
1383 mCallback = nullptr; |
1383 mCallback = nullptr; |
1384 } else { |
1384 } else { |
1385 mResult = result; |
1385 mResult = result; |
1386 } |
1386 } |
1794 "/modules/libjar", |
1794 "/modules/libjar", |
1795 + "/toolkit/xre", |
1795 + "/toolkit/xre", |
1796 ] |
1796 ] |
1797 |
1797 |
1798 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": |
1798 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": |
1799 CXXFLAGS += CONFIG["TK_CFLAGS"] |
1799 CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] |
1800 if CONFIG["MOZ_ENABLE_DBUS"]: |
1800 if CONFIG["MOZ_ENABLE_DBUS"]: |
1801 CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"] |
1801 CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"] |
1802 |
1802 |
1803 if CONFIG["MOZ_BACKGROUNDTASKS"]: |
1803 if CONFIG["MOZ_BACKGROUNDTASKS"]: |
1804 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp |
1804 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp |
1805 --- a/xpcom/io/nsLocalFileUnix.cpp |
1805 --- a/xpcom/io/nsLocalFileUnix.cpp |
1806 +++ b/xpcom/io/nsLocalFileUnix.cpp |
1806 +++ b/xpcom/io/nsLocalFileUnix.cpp |
1807 @@ -53,16 +53,17 @@ |
1807 @@ -54,16 +54,17 @@ |
1808 #include "prproces.h" |
1808 #include "prproces.h" |
1809 #include "nsIDirectoryEnumerator.h" |
1809 #include "nsIDirectoryEnumerator.h" |
1810 #include "nsSimpleEnumerator.h" |
1810 #include "nsSimpleEnumerator.h" |
1811 #include "private/pprio.h" |
1811 #include "private/pprio.h" |
1812 #include "prlink.h" |
1812 #include "prlink.h" |
1820 # include <Carbon/Carbon.h> |
1820 # include <Carbon/Carbon.h> |
1821 # include "CocoaFileUtils.h" |
1821 # include "CocoaFileUtils.h" |
1822 # include "prmem.h" |
1822 # include "prmem.h" |
1823 # include "plbase64.h" |
1823 # include "plbase64.h" |
1824 |
1824 |
1825 @@ -2025,62 +2026,77 @@ nsLocalFile::SetPersistentDescriptor(con |
1825 @@ -2071,62 +2072,77 @@ nsLocalFile::SetPersistentDescriptor(con |
1826 |
1826 |
1827 NS_IMETHODIMP |
1827 NS_IMETHODIMP |
1828 nsLocalFile::Reveal() { |
1828 nsLocalFile::Reveal() { |
1829 if (!FilePreferences::IsAllowedPath(mPath)) { |
1829 if (!FilePreferences::IsAllowedPath(mPath)) { |
1830 return NS_ERROR_FILE_ACCESS_DENIED; |
1830 return NS_ERROR_FILE_ACCESS_DENIED; |