wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-06 07:17:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Use MOZ_FENNEC and MOZ_XULRUNNER instead of checking MOZ_BUILD_APP in most places

Browse source
This commit is contained in:
NTD 2018-03-01 14:26:41 -05:00 • committed by Roy Tam
commit a25b655d51
17 changed files with 31 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

3
toolkit/components/cookie/moz.build
View file

@ -4,7 +4,4 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
if CONFIG['MOZ_BUILD_APP'] == 'mobile/android':
DEFINES['MOZ_FENNEC'] = True
JAR_MANIFESTS += ['jar.mn']

2
toolkit/components/moz.build
View file

@ -73,7 +73,7 @@ if CONFIG['MOZ_WEBEXTENSIONS']:
if CONFIG['ENABLE_INTL_API']:
DIRS += ['mozintl']
if CONFIG['MOZ_BUILD_APP'] != 'mobile/android':
if not CONFIG['MOZ_FENNEC']:
DIRS += ['narrate', 'viewsource'];
if CONFIG['NS_PRINTING']:

4
toolkit/components/search/moz.build
View file

@ -11,9 +11,9 @@ EXTRA_COMPONENTS += [
'nsSearchSuggestions.js',
]
if CONFIG['MOZ_BUILD_APP'] in ['mobile/android', 'xulrunner'] or CONFIG['MOZ_PHOENIX']:
if CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_FENNEC'] or CONFIG['MOZ_XULRUNNER']:
DEFINES['HAVE_SIDEBAR'] = True
EXTRA_COMPONENTS += [
EXTRA_PP_COMPONENTS += [
'nsSidebar.js',
]

12
toolkit/components/search/nsSearchService.js
View file

@ -4676,9 +4676,9 @@ SearchService.prototype = {
Services.obs.addObserver(this, SEARCH_ENGINE_TOPIC, false);
Services.obs.addObserver(this, QUIT_APPLICATION_TOPIC, false);
if (AppConstants.MOZ_BUILD_APP == "mobile/android") {
Services.prefs.addObserver(LOCALE_PREF, this, false);
}
#ifdef MOZ_FENNEC
Services.prefs.addObserver(LOCALE_PREF, this, false);
#endif
// The current stage of shutdown. Used to help analyze crash
// signatures in case of shutdown timeout.
@ -4721,9 +4721,9 @@ SearchService.prototype = {
Services.obs.removeObserver(this, SEARCH_ENGINE_TOPIC);
Services.obs.removeObserver(this, QUIT_APPLICATION_TOPIC);
if (AppConstants.MOZ_BUILD_APP == "mobile/android") {
Services.prefs.removeObserver(LOCALE_PREF, this);
}
#ifdef MOZ_FENNEC
Services.prefs.removeObserver(LOCALE_PREF, this);
#endif
},
QueryInterface: XPCOMUtils.generateQI([