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 65e96e081f6f4b68d6b7998f4182a3764832c2ce |
6 # Parent b8fad36c438a0d20ffe73630e35c17addb4ee57d |
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 |
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 @@ -4865,17 +4877,17 @@ nsresult Preferences::InitInitialObjects |
62 @@ -4897,17 +4909,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 @@ -120,16 +120,20 @@ EXPORTS.mozilla += [ |
84 @@ -121,16 +121,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", |
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 @@ -1254,36 +1254,66 @@ nsUnknownContentTypeDialog.prototype = { |
168 @@ -1265,36 +1265,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. |
766 using mozilla::dom::HandlerApp; |
766 using mozilla::dom::HandlerApp; |
767 using mozilla::dom::HandlerInfo; |
767 using mozilla::dom::HandlerInfo; |
768 using mozilla::dom::RemoteHandlerApp; |
768 using mozilla::dom::RemoteHandlerApp; |
769 |
769 |
770 namespace { |
770 namespace { |
771 @@ -299,17 +299,17 @@ mozilla::ipc::IPCResult HandlerServicePa |
771 @@ -300,17 +300,17 @@ mozilla::ipc::IPCResult HandlerServicePa |
772 mozilla::ipc::IPCResult HandlerServiceParent::RecvExistsForProtocolOS( |
772 const nsACString& aProtocolScheme, bool* aHandlerExists) { |
773 const nsCString& aProtocolScheme, bool* aHandlerExists) { |
|
774 if (aProtocolScheme.Length() > MAX_SCHEME_LENGTH) { |
773 if (aProtocolScheme.Length() > MAX_SCHEME_LENGTH) { |
775 *aHandlerExists = false; |
774 *aHandlerExists = false; |
776 return IPC_OK(); |
775 return IPC_OK(); |
777 } |
776 } |
778 #ifdef MOZ_WIDGET_GTK |
777 #ifdef MOZ_WIDGET_GTK |
779 // Check the GNOME registry for a protocol handler |
778 // Check the GNOME registry for a protocol handler |
780 - *aHandlerExists = nsGNOMERegistry::HandlerExists(aProtocolScheme.get()); |
779 *aHandlerExists = |
781 + *aHandlerExists = nsCommonRegistry::HandlerExists(aProtocolScheme.get()); |
780 - nsGNOMERegistry::HandlerExists(PromiseFlatCString(aProtocolScheme).get()); |
|
781 + nsCommonRegistry::HandlerExists(PromiseFlatCString(aProtocolScheme).get()); |
782 #else |
782 #else |
783 *aHandlerExists = false; |
783 *aHandlerExists = false; |
784 #endif |
784 #endif |
785 return IPC_OK(); |
785 return IPC_OK(); |
786 } |
786 } |