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 48866e4a200fb5299b94af4d9841e38336cff9f4 |
6 # Parent d942febc5733911d795d1cec027fb4f3c0a6e53b |
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 |
89 |
89 |
90 NS_CreateServicesFromCategory(NS_PREFSERVICE_APPDEFAULTS_TOPIC_ID, nullptr, |
90 NS_CreateServicesFromCategory(NS_PREFSERVICE_APPDEFAULTS_TOPIC_ID, nullptr, |
91 diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build |
91 diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build |
92 --- a/modules/libpref/moz.build |
92 --- a/modules/libpref/moz.build |
93 +++ b/modules/libpref/moz.build |
93 +++ b/modules/libpref/moz.build |
94 @@ -113,16 +113,20 @@ EXPORTS.mozilla += [ |
94 @@ -114,16 +114,20 @@ EXPORTS.mozilla += [ |
95 ] |
95 ] |
96 EXPORTS.mozilla += sorted(['!' + g for g in gen_h]) |
96 EXPORTS.mozilla += sorted(['!' + g for g in gen_h]) |
97 |
97 |
98 UNIFIED_SOURCES += [ |
98 UNIFIED_SOURCES += [ |
99 'Preferences.cpp', |
99 'Preferences.cpp', |
155 self.base = base |
155 self.base = base |
156 self.flags = Flags(*flags) |
156 self.flags = Flags(*flags) |
157 diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build |
157 diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build |
158 --- a/toolkit/components/downloads/moz.build |
158 --- a/toolkit/components/downloads/moz.build |
159 +++ b/toolkit/components/downloads/moz.build |
159 +++ b/toolkit/components/downloads/moz.build |
160 @@ -41,10 +41,14 @@ XPCOM_MANIFESTS += [ |
160 @@ -46,10 +46,14 @@ XPCOM_MANIFESTS += [ |
161 |
161 |
162 if CONFIG['MOZ_PLACES']: |
162 if CONFIG['MOZ_PLACES']: |
163 EXTRA_JS_MODULES += [ |
163 EXTRA_JS_MODULES += [ |
164 'DownloadHistory.jsm', |
164 'DownloadHistory.jsm', |
165 ] |
165 ] |
173 with Files('**'): |
173 with Files('**'): |
174 BUG_COMPONENT = ('Toolkit', 'Downloads API') |
174 BUG_COMPONENT = ('Toolkit', 'Downloads API') |
175 diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downloads/HelperAppDlg.jsm |
175 diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downloads/HelperAppDlg.jsm |
176 --- a/toolkit/mozapps/downloads/HelperAppDlg.jsm |
176 --- a/toolkit/mozapps/downloads/HelperAppDlg.jsm |
177 +++ b/toolkit/mozapps/downloads/HelperAppDlg.jsm |
177 +++ b/toolkit/mozapps/downloads/HelperAppDlg.jsm |
178 @@ -1195,36 +1195,66 @@ nsUnknownContentTypeDialog.prototype = { |
178 @@ -1209,36 +1209,66 @@ nsUnknownContentTypeDialog.prototype = { |
179 params.handlerApp && |
179 params.handlerApp && |
180 params.handlerApp.executable && |
180 params.handlerApp.executable && |
181 params.handlerApp.executable.isFile() |
181 params.handlerApp.executable.isFile() |
182 ) { |
182 ) { |
183 // Remember the file they chose to run. |
183 // Remember the file they chose to run. |