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 a6ee87356867ce6ed5b0be1ba2c2690a488beb55 |
6 # Parent 191cd9e24a9e0812f74c808ceef611c8b10141e1 |
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 @@ -4878,16 +4879,27 @@ nsresult Preferences::InitInitialObjects |
34 @@ -4882,16 +4883,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 #if defined(MOZ_WIDGET_GTK) |
60 #if defined(MOZ_WIDGET_GTK) |
61 // Under Flatpak/Snap package, load /etc/firefox/defaults/pref/*.js. |
61 // Under Flatpak/Snap package, load /etc/firefox/defaults/pref/*.js. |
62 @@ -4969,17 +4981,17 @@ nsresult Preferences::InitInitialObjects |
62 @@ -4973,17 +4985,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 @@ -229,16 +229,17 @@ class Flags(OrderedDict): |
108 @@ -228,16 +228,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 @@ -39,16 +39,17 @@ class ManifestEntry(object): |
129 @@ -37,16 +37,17 @@ class ManifestEntry(object): |
130 "os", |
130 "os", |
131 "osversion", |
131 "osversion", |
132 "abi", |
132 "abi", |
133 "xpcnativewrappers", |
133 "xpcnativewrappers", |
134 "tablet", |
134 "tablet", |
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 @@ -1239,36 +1239,66 @@ nsUnknownContentTypeDialog.prototype = { |
168 @@ -1240,36 +1240,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. |
1702 nsTextFormatter::ssprintf(osVersion, u"%ld.%ld", gtk_major_version, |
1702 nsTextFormatter::ssprintf(osVersion, u"%ld.%ld", gtk_major_version, |
1703 gtk_minor_version); |
1703 gtk_minor_version); |
1704 + desktop = nsKDEUtils::kdeSession() ? u"kde"_ns : u"gnome"_ns; |
1704 + desktop = nsKDEUtils::kdeSession() ? u"kde"_ns : u"gnome"_ns; |
1705 #elif defined(MOZ_WIDGET_ANDROID) |
1705 #elif defined(MOZ_WIDGET_ANDROID) |
1706 bool isTablet = false; |
1706 bool isTablet = false; |
1707 if (mozilla::AndroidBridge::Bridge()) { |
1707 if (jni::IsAvailable()) { |
1708 mozilla::AndroidBridge::Bridge()->GetStaticStringField( |
1708 jni::String::LocalRef release = java::sdk::Build::VERSION::RELEASE(); |
1709 "android/os/Build$VERSION", "RELEASE", osVersion); |
1709 osVersion.Assign(release->ToString()); |
1710 isTablet = java::GeckoAppShell::IsTablet(); |
1710 isTablet = java::GeckoAppShell::IsTablet(); |
1711 } |
1711 } |
1712 + desktop = u"android"_ns; |
1712 + desktop = u"android"_ns; |
1713 #endif |
1713 #endif |
1714 |
1714 |