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 b6b4d42b51c6a815116505bf7e9b34a5e2f0c65b |
6 # Parent 4f8492f0f4bfa17f5b4523a1cdda15a45e3d74d3 |
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 |
12 |
12 |
13 diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp |
13 diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp |
14 --- a/modules/libpref/Preferences.cpp |
14 --- a/modules/libpref/Preferences.cpp |
15 +++ b/modules/libpref/Preferences.cpp |
15 +++ b/modules/libpref/Preferences.cpp |
16 @@ -90,16 +90,17 @@ |
16 @@ -91,16 +91,17 @@ |
17 #include "plstr.h" |
17 #include "plstr.h" |
18 #include "prdtoa.h" |
18 #include "prdtoa.h" |
19 #include "prlink.h" |
19 #include "prlink.h" |
20 #include "xpcpublic.h" |
20 #include "xpcpublic.h" |
21 #include "js/RootingAPI.h" |
21 #include "js/RootingAPI.h" |
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 @@ -4982,17 +4994,17 @@ nsresult Preferences::InitInitialObjects |
62 @@ -4981,17 +4993,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; |
103 inputs=["init/StaticPrefList.yaml"] |
103 inputs=["init/StaticPrefList.yaml"] |
104 ) |
104 ) |
105 diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py |
105 diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py |
106 --- a/python/mozbuild/mozpack/chrome/flags.py |
106 --- a/python/mozbuild/mozpack/chrome/flags.py |
107 +++ b/python/mozbuild/mozpack/chrome/flags.py |
107 +++ b/python/mozbuild/mozpack/chrome/flags.py |
108 @@ -228,16 +228,17 @@ class Flags(OrderedDict): |
108 @@ -229,16 +229,17 @@ class Flags(OrderedDict): |
109 "os": StringFlag, |
109 "os": StringFlag, |
110 "osversion": VersionFlag, |
110 "osversion": VersionFlag, |
111 "abi": StringFlag, |
111 "abi": StringFlag, |
112 "platform": Flag, |
112 "platform": Flag, |
113 "xpcnativewrappers": Flag, |
113 "xpcnativewrappers": Flag, |
124 flags = Flags('contentaccessible=yes', 'appversion>=3.5') |
124 flags = Flags('contentaccessible=yes', 'appversion>=3.5') |
125 """ |
125 """ |
126 diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpack/chrome/manifest.py |
126 diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpack/chrome/manifest.py |
127 --- a/python/mozbuild/mozpack/chrome/manifest.py |
127 --- a/python/mozbuild/mozpack/chrome/manifest.py |
128 +++ b/python/mozbuild/mozpack/chrome/manifest.py |
128 +++ b/python/mozbuild/mozpack/chrome/manifest.py |
129 @@ -37,16 +37,17 @@ class ManifestEntry(object): |
129 @@ -38,16 +38,17 @@ class ManifestEntry(object): |
130 "os", |
130 "os", |
131 "osversion", |
131 "osversion", |
132 "abi", |
132 "abi", |
133 "xpcnativewrappers", |
133 "xpcnativewrappers", |
134 "tablet", |
134 "tablet", |
747 + |
747 + |
748 +#endif // nsKDEUtils |
748 +#endif // nsKDEUtils |
749 diff --git a/uriloader/exthandler/HandlerServiceParent.cpp b/uriloader/exthandler/HandlerServiceParent.cpp |
749 diff --git a/uriloader/exthandler/HandlerServiceParent.cpp b/uriloader/exthandler/HandlerServiceParent.cpp |
750 --- a/uriloader/exthandler/HandlerServiceParent.cpp |
750 --- a/uriloader/exthandler/HandlerServiceParent.cpp |
751 +++ b/uriloader/exthandler/HandlerServiceParent.cpp |
751 +++ b/uriloader/exthandler/HandlerServiceParent.cpp |
752 @@ -7,17 +7,17 @@ |
752 @@ -13,17 +13,17 @@ |
753 #include "mozilla/ipc/ProtocolUtils.h" |
|
754 #include "mozilla/Logging.h" |
|
755 #include "HandlerServiceParent.h" |
|
756 #include "nsIHandlerService.h" |
|
757 #include "nsIMIMEInfo.h" |
|
758 #include "ContentHandlerService.h" |
753 #include "ContentHandlerService.h" |
|
754 #include "nsIExternalProtocolService.h" |
759 #include "nsStringEnumerator.h" |
755 #include "nsStringEnumerator.h" |
|
756 #include "nsIMutableArray.h" |
|
757 #include "nsCExternalHandlerService.h" |
|
758 #include "nsComponentManagerUtils.h" |
|
759 #include "nsServiceManagerUtils.h" |
760 #ifdef MOZ_WIDGET_GTK |
760 #ifdef MOZ_WIDGET_GTK |
761 -# include "unix/nsGNOMERegistry.h" |
761 -# include "unix/nsGNOMERegistry.h" |
762 +# include "unix/nsCommonRegistry.h" |
762 +# include "unix/nsCommonRegistry.h" |
763 #endif |
763 #endif |
764 |
764 |
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 @@ -300,17 +300,17 @@ mozilla::ipc::IPCResult HandlerServicePa |
771 @@ -306,17 +306,17 @@ mozilla::ipc::IPCResult HandlerServicePa |
772 const nsACString& aProtocolScheme, bool* aHandlerExists) { |
772 const nsACString& aProtocolScheme, bool* aHandlerExists) { |
773 if (aProtocolScheme.Length() > MAX_SCHEME_LENGTH) { |
773 if (aProtocolScheme.Length() > MAX_SCHEME_LENGTH) { |
774 *aHandlerExists = false; |
774 *aHandlerExists = false; |
775 return IPC_OK(); |
775 return IPC_OK(); |
776 } |
776 } |