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 a22a4c4e41107a0809c33a83e9d14916738c5a82 |
6 # Parent e89d21ead66fbb34b6349edda42748a3ad9e6136 |
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 @@ -4530,25 +4531,37 @@ nsresult Preferences::InitInitialObjects |
34 @@ -4536,25 +4537,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 @@ -4594,17 +4607,17 @@ nsresult Preferences::InitInitialObjects |
72 @@ -4600,17 +4613,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; |
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 @@ -1203,36 +1203,66 @@ nsUnknownContentTypeDialog.prototype = { |
178 @@ -1239,36 +1239,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. |
1291 NS_ASSERTION(!gnomeInfo->HasExtensions(), "How'd that happen?"); |
1291 NS_ASSERTION(!gnomeInfo->HasExtensions(), "How'd that happen?"); |
1292 gnomeInfo->SetFileExtensions(NS_ConvertUTF16toUTF8(extensions)); |
1292 gnomeInfo->SetFileExtensions(NS_ConvertUTF16toUTF8(extensions)); |
1293 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build |
1293 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build |
1294 --- a/widget/gtk/moz.build |
1294 --- a/widget/gtk/moz.build |
1295 +++ b/widget/gtk/moz.build |
1295 +++ b/widget/gtk/moz.build |
1296 @@ -133,16 +133,17 @@ include('/ipc/chromium/chromium-config.m |
1296 @@ -134,16 +134,17 @@ FINAL_LIBRARY = 'xul' |
1297 FINAL_LIBRARY = 'xul' |
|
1298 |
1297 |
1299 LOCAL_INCLUDES += [ |
1298 LOCAL_INCLUDES += [ |
1300 '/layout/base', |
1299 '/layout/base', |
|
1300 '/layout/forms', |
1301 '/layout/generic', |
1301 '/layout/generic', |
1302 '/layout/xul', |
1302 '/layout/xul', |
1303 '/other-licenses/atk-1.0', |
1303 '/other-licenses/atk-1.0', |
1304 '/third_party/cups/include', |
1304 '/third_party/cups/include', |
1305 + '/toolkit/xre', |
1305 + '/toolkit/xre', |