wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1048131 - Remove MOZ_CAPTIVEDETECT and enable captive portal detector for all products. r=mcmanus

Browse Source
This commit is contained in:
Valentin Gosu 2015-07-03 17:14:51 +02:00
parent 0eb4004edd
commit a8a7000530
8 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
b2g/chrome/content/shell.js
View File

@ -66,11 +66,9 @@ XPCOMUtils.defineLazyGetter(this, "libcutils", function () {
}); });
#endif #endif
#ifdef MOZ_CAPTIVEDETECT
XPCOMUtils.defineLazyServiceGetter(Services, 'captivePortalDetector', XPCOMUtils.defineLazyServiceGetter(Services, 'captivePortalDetector',
'@mozilla.org/toolkit/captive-detector;1', '@mozilla.org/toolkit/captive-detector;1',
'nsICaptivePortalDetector'); 'nsICaptivePortalDetector');
#endif
#ifdef MOZ_SAFE_BROWSING #ifdef MOZ_SAFE_BROWSING
XPCOMUtils.defineLazyModuleGetter(this, "SafeBrowsing", XPCOMUtils.defineLazyModuleGetter(this, "SafeBrowsing",

1
b2g/confvars.sh
View File

@ -20,7 +20,6 @@ MOZ_OFFICIAL_BRANDING_DIRECTORY=b2g/branding/official
MOZ_SAFE_BROWSING=1 MOZ_SAFE_BROWSING=1
MOZ_SERVICES_COMMON=1 MOZ_SERVICES_COMMON=1
MOZ_SERVICES_METRICS=1 MOZ_SERVICES_METRICS=1
MOZ_CAPTIVEDETECT=1
MOZ_WEBSMS_BACKEND=1 MOZ_WEBSMS_BACKEND=1
MOZ_NO_SMART_CARDS=1 MOZ_NO_SMART_CARDS=1

4
b2g/installer/package-manifest.in
View File

@ -317,9 +317,7 @@
@RESPATH@/components/services-crypto.xpt @RESPATH@/components/services-crypto.xpt
#endif #endif
@RESPATH@/components/services-crypto-component.xpt @RESPATH@/components/services-crypto-component.xpt
#ifdef MOZ_CAPTIVEDETECT
@RESPATH@/components/captivedetect.xpt @RESPATH@/components/captivedetect.xpt
#endif
@RESPATH@/components/shellservice.xpt @RESPATH@/components/shellservice.xpt
@RESPATH@/components/shistory.xpt @RESPATH@/components/shistory.xpt
@RESPATH@/components/spellchecker.xpt @RESPATH@/components/spellchecker.xpt
@ -633,10 +631,8 @@
@RESPATH@/components/HealthReportComponents.manifest @RESPATH@/components/HealthReportComponents.manifest
@RESPATH@/components/HealthReportService.js @RESPATH@/components/HealthReportService.js
#endif #endif
#ifdef MOZ_CAPTIVEDETECT
@RESPATH@/components/CaptivePortalDetectComponents.manifest @RESPATH@/components/CaptivePortalDetectComponents.manifest
@RESPATH@/components/captivedetect.js @RESPATH@/components/captivedetect.js
#endif
@RESPATH@/components/TelemetryStartup.js @RESPATH@/components/TelemetryStartup.js
@RESPATH@/components/TelemetryStartup.manifest @RESPATH@/components/TelemetryStartup.manifest
@RESPATH@/components/XULStore.js @RESPATH@/components/XULStore.js

4
browser/installer/package-manifest.in
View File

@ -314,9 +314,7 @@
@RESPATH@/components/saxparser.xpt @RESPATH@/components/saxparser.xpt
@RESPATH@/browser/components/sessionstore.xpt @RESPATH@/browser/components/sessionstore.xpt
@RESPATH@/components/services-crypto-component.xpt @RESPATH@/components/services-crypto-component.xpt
#ifdef MOZ_CAPTIVEDETECT
@RESPATH@/components/captivedetect.xpt @RESPATH@/components/captivedetect.xpt
#endif
@RESPATH@/browser/components/shellservice.xpt @RESPATH@/browser/components/shellservice.xpt
@RESPATH@/components/shistory.xpt @RESPATH@/components/shistory.xpt
@RESPATH@/components/spellchecker.xpt @RESPATH@/components/spellchecker.xpt
@ -521,10 +519,8 @@
@RESPATH@/components/SyncComponents.manifest @RESPATH@/components/SyncComponents.manifest
@RESPATH@/components/Weave.js @RESPATH@/components/Weave.js
#endif #endif
#ifdef MOZ_CAPTIVEDETECT
@RESPATH@/components/CaptivePortalDetectComponents.manifest @RESPATH@/components/CaptivePortalDetectComponents.manifest
@RESPATH@/components/captivedetect.js @RESPATH@/components/captivedetect.js
#endif
@RESPATH@/components/servicesComponents.manifest @RESPATH@/components/servicesComponents.manifest
@RESPATH@/components/cryptoComponents.manifest @RESPATH@/components/cryptoComponents.manifest
@RESPATH@/components/TelemetryStartup.js @RESPATH@/components/TelemetryStartup.js

6
configure.in
View File

@ -8489,12 +8489,6 @@ if test -n "$MOZ_SERVICES_CLOUDSYNC"; then
AC_DEFINE(MOZ_SERVICES_CLOUDSYNC) AC_DEFINE(MOZ_SERVICES_CLOUDSYNC)
fi fi
dnl Build Captive Portal Detector if required
AC_SUBST(MOZ_CAPTIVEDETECT)
if test -n "$MOZ_CAPTIVEDETECT"; then
AC_DEFINE(MOZ_CAPTIVEDETECT)
fi
dnl Build second screen and casting features for external devices if required dnl Build second screen and casting features for external devices if required
AC_SUBST(MOZ_DEVICES) AC_SUBST(MOZ_DEVICES)
if test -n "$MOZ_DEVICES"; then if test -n "$MOZ_DEVICES"; then

4
mobile/android/installer/package-manifest.in
View File

@ -240,9 +240,7 @@
@BINPATH@/components/saxparser.xpt @BINPATH@/components/saxparser.xpt
@BINPATH@/components/sessionstore.xpt @BINPATH@/components/sessionstore.xpt
@BINPATH@/components/services-crypto-component.xpt @BINPATH@/components/services-crypto-component.xpt
#ifdef MOZ_CAPTIVEDETECT
@BINPATH@/components/captivedetect.xpt @BINPATH@/components/captivedetect.xpt
#endif
@BINPATH@/components/shellservice.xpt @BINPATH@/components/shellservice.xpt
@BINPATH@/components/shistory.xpt @BINPATH@/components/shistory.xpt
@BINPATH@/components/spellchecker.xpt @BINPATH@/components/spellchecker.xpt
@ -437,10 +435,8 @@
@BINPATH@/components/HealthReportService.js @BINPATH@/components/HealthReportService.js
#endif #endif
#ifdef MOZ_CAPTIVEDETECT
@BINPATH@/components/CaptivePortalDetectComponents.manifest @BINPATH@/components/CaptivePortalDetectComponents.manifest
@BINPATH@/components/captivedetect.js @BINPATH@/components/captivedetect.js
#endif
#ifdef MOZ_WEBSPEECH #ifdef MOZ_WEBSPEECH
@BINPATH@/components/dom_webspeechsynth.xpt @BINPATH@/components/dom_webspeechsynth.xpt

4
modules/libpref/init/all.js
View File

@ -4620,11 +4620,11 @@ pref("ui.touch_activation.duration_ms", 10);
// actions when the fifo is written to. Disable this in general. // actions when the fifo is written to. Disable this in general.
pref("memory_info_dumper.watch_fifo.enabled", false); pref("memory_info_dumper.watch_fifo.enabled", false);
#ifdef MOZ_CAPTIVEDETECT pref("captivedetect.canonicalURL", "http://detectportal.firefox.com/success.txt");
pref("captivedetect.canonicalContent", "success\n");
pref("captivedetect.maxWaitingTime", 5000); pref("captivedetect.maxWaitingTime", 5000);
pref("captivedetect.pollingTime", 3000); pref("captivedetect.pollingTime", 3000);
pref("captivedetect.maxRetryCount", 5); pref("captivedetect.maxRetryCount", 5);
#endif
#ifdef RELEASE_BUILD #ifdef RELEASE_BUILD
pref("dom.forms.inputmode", false); pref("dom.forms.inputmode", false);

1
toolkit/components/moz.build
View File

@ -87,7 +87,6 @@ if CONFIG['MOZ_TOOLKIT_SEARCH']:
if CONFIG['MOZ_URL_CLASSIFIER']: if CONFIG['MOZ_URL_CLASSIFIER']:
DIRS += ['url-classifier'] DIRS += ['url-classifier']
if CONFIG['MOZ_CAPTIVEDETECT']:
DIRS += ['captivedetect'] DIRS += ['captivedetect']
if CONFIG['MOZ_WIDGET_TOOLKIT'] != "gonk" and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android': if CONFIG['MOZ_WIDGET_TOOLKIT'] != "gonk" and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':