summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@gmail.com>2018-10-24 06:41:20 +0200
committerGitHub <noreply@github.com>2018-10-24 06:41:20 +0200
commitf71c04d814416ebf52dd54109f2d04f1cbd397c0 (patch)
tree578f23631e84aff1c50bb9c5c5e7999475fad607
parentd07a4f2ba9295068681ecfb8e36418f6b72c3d56 (diff)
parentafe69140a8485b271d8f6ac1d7551540cea11c66 (diff)
downloadUXP-f71c04d814416ebf52dd54109f2d04f1cbd397c0.tar
UXP-f71c04d814416ebf52dd54109f2d04f1cbd397c0.tar.gz
UXP-f71c04d814416ebf52dd54109f2d04f1cbd397c0.tar.lz
UXP-f71c04d814416ebf52dd54109f2d04f1cbd397c0.tar.xz
UXP-f71c04d814416ebf52dd54109f2d04f1cbd397c0.zip
Merge pull request #851 from MoonchildProductions/revert-796-nsuserinfo
Revert "Make nsIUserInfo component optional with --disable-userinfo at build time"
-rw-r--r--build/moz.configure/old.configure1
-rw-r--r--old-configure.in17
-rw-r--r--toolkit/components/build/nsToolkitCompsModule.cpp10
-rw-r--r--toolkit/components/startup/moz.build21
-rw-r--r--toolkit/components/startup/public/moz.build8
5 files changed, 17 insertions, 40 deletions
diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
index e6eaa8228..20bde1eee 100644
--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -243,7 +243,6 @@ def old_configure_options(*options):
'--enable-universalchardet',
'--enable-updater',
'--enable-url-classifier',
- '--enable-userinfo',
'--enable-valgrind',
'--enable-verify-mar',
'--enable-webrtc',
diff --git a/old-configure.in b/old-configure.in
index 9246b0c41..80597eb73 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -2247,7 +2247,6 @@ MOZ_PLACES=1
MOZ_SERVICES_HEALTHREPORT=1
MOZ_SERVICES_SYNC=1
MOZ_SERVICES_CLOUDSYNC=1
-MOZ_USERINFO=1
case "$target_os" in
mingw*)
@@ -4588,22 +4587,6 @@ fi
AC_SUBST(MOZ_DEVTOOLS)
dnl ========================================================
-dnl = Disable nsUserInfo
-dnl ========================================================
-MOZ_ARG_DISABLE_BOOL(userinfo,
-[ --disable-userinfo Disable nsUserInfo],
- MOZ_USERINFO=,
- MOZ_USERINFO=1)
-
-
-
-if test -n "$MOZ_USERINFO"; then
- AC_DEFINE(MOZ_USERINFO)
-fi
-
-AC_SUBST(MOZ_USERINFO)
-
-dnl ========================================================
dnl = Define default location for MOZILLA_FIVE_HOME
dnl ========================================================
MOZ_ARG_WITH_STRING(default-mozilla-five-home,
diff --git a/toolkit/components/build/nsToolkitCompsModule.cpp b/toolkit/components/build/nsToolkitCompsModule.cpp
index 2b4d7c14b..190c4da06 100644
--- a/toolkit/components/build/nsToolkitCompsModule.cpp
+++ b/toolkit/components/build/nsToolkitCompsModule.cpp
@@ -5,9 +5,7 @@
#include "mozilla/ModuleUtils.h"
#include "nsAppStartup.h"
#include "nsNetCID.h"
-#ifdef MOZ_USERINFO
#include "nsUserInfo.h"
-#endif
#include "nsToolkitCompsCID.h"
#include "nsFindService.h"
#if defined(MOZ_UPDATER) && !defined(MOZ_WIDGET_ANDROID)
@@ -78,9 +76,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPerformanceStatsService, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsTerminator)
#endif
-#if defined(MOZ_USERINFO)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsUserInfo)
-#endif
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFindService)
#if !defined(MOZ_DISABLE_PARENTAL_CONTROLS)
@@ -145,9 +141,7 @@ NS_DEFINE_NAMED_CID(NS_TOOLKIT_PERFORMANCESTATSSERVICE_CID);
#if defined(MOZ_HAS_TERMINATOR)
NS_DEFINE_NAMED_CID(NS_TOOLKIT_TERMINATOR_CID);
#endif
-#if defined(NS_USERINFO)
NS_DEFINE_NAMED_CID(NS_USERINFO_CID);
-#endif // defined (MOZ_USERINFO)
NS_DEFINE_NAMED_CID(ALERT_NOTIFICATION_CID);
NS_DEFINE_NAMED_CID(NS_ALERTSSERVICE_CID);
#if !defined(MOZ_DISABLE_PARENTAL_CONTROLS)
@@ -185,9 +179,7 @@ static const Module::CIDEntry kToolkitCIDs[] = {
#if defined(MOZ_HAS_PERFSTATS)
{ &kNS_TOOLKIT_PERFORMANCESTATSSERVICE_CID, false, nullptr, nsPerformanceStatsServiceConstructor },
#endif // defined (MOZ_HAS_PERFSTATS)
-#if defined(MOZ_USERINFO)
{ &kNS_USERINFO_CID, false, nullptr, nsUserInfoConstructor },
-#endif // defined (MOZ_USERINFO)
{ &kALERT_NOTIFICATION_CID, false, nullptr, AlertNotificationConstructor },
{ &kNS_ALERTSSERVICE_CID, false, nullptr, nsAlertsServiceConstructor },
#if !defined(MOZ_DISABLE_PARENTAL_CONTROLS)
@@ -227,9 +219,7 @@ static const Module::ContractIDEntry kToolkitContracts[] = {
#if defined(MOZ_HAS_PERFSTATS)
{ NS_TOOLKIT_PERFORMANCESTATSSERVICE_CONTRACTID, &kNS_TOOLKIT_PERFORMANCESTATSSERVICE_CID },
#endif // defined (MOZ_HAS_PERFSTATS)
-#if defined(NS_USERINFO)
{ NS_USERINFO_CONTRACTID, &kNS_USERINFO_CID },
-#endif // defined(NSUSERINFO)
{ ALERT_NOTIFICATION_CONTRACTID, &kALERT_NOTIFICATION_CID },
{ NS_ALERTSERVICE_CONTRACTID, &kNS_ALERTSSERVICE_CID },
#if !defined(MOZ_DISABLE_PARENTAL_CONTROLS)
diff --git a/toolkit/components/startup/moz.build b/toolkit/components/startup/moz.build
index 5f290b783..dbd580384 100644
--- a/toolkit/components/startup/moz.build
+++ b/toolkit/components/startup/moz.build
@@ -18,14 +18,19 @@ UNIFIED_SOURCES += [
'StartupTimeline.cpp',
]
-if CONFIG['MOZ_USERINFO']:
- if CONFIG['OS_ARCH'] == 'WINNT':
- # This file cannot be built in unified mode because of name clashes with Windows headers.
- SOURCES += ['nsUserInfoWin.cpp']
- elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
- UNIFIED_SOURCES += ['nsUserInfoMac.mm']
- else:
- UNIFIED_SOURCES += ['nsUserInfoUnix.cpp']
+if CONFIG['OS_ARCH'] == 'WINNT':
+ # This file cannot be built in unified mode because of name clashes with Windows headers.
+ SOURCES += [
+ 'nsUserInfoWin.cpp',
+ ]
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+ UNIFIED_SOURCES += [
+ 'nsUserInfoMac.mm',
+ ]
+else:
+ UNIFIED_SOURCES += [
+ 'nsUserInfoUnix.cpp',
+ ]
FINAL_LIBRARY = 'xul'
diff --git a/toolkit/components/startup/public/moz.build b/toolkit/components/startup/public/moz.build
index 948a7d7ee..5894b6c51 100644
--- a/toolkit/components/startup/public/moz.build
+++ b/toolkit/components/startup/public/moz.build
@@ -4,10 +4,10 @@
# 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/.
-XPIDL_SOURCES += ['nsIAppStartup.idl']
-
-if CONFIG['MOZ_USERINFO']:
- XPIDL_SOURCES += ['nsIUserInfo.idl']
+XPIDL_SOURCES += [
+ 'nsIAppStartup.idl',
+ 'nsIUserInfo.idl',
+]
XPIDL_MODULE = 'appstartup'