Bug 1257326 - Remove MOZ_SERVICES_NOTIFICATIONS. draft
authorChris Manchester <cmanchester@mozilla.com>
Mon, 09 May 2016 17:06:11 -0700
changeset 365074 aa34d39abd8aa447457e4d1f22e58c2d9fe99d99
parent 365073 b4f4f7b36a9845999cbdce198ffb18ee648afab7
child 365075 fd471bc2810f9cf6c7dd0eb237f9b716ea1f392b
push id17624
push usercmanchester@mozilla.com
push dateTue, 10 May 2016 00:06:24 +0000
bugs1257326
milestone49.0a1
Bug 1257326 - Remove MOZ_SERVICES_NOTIFICATIONS. It is never set by default, and only triggers installation of a prefs file that no longer exists if it is set. MozReview-Commit-ID: 8OQXRCmpsIT
browser/installer/package-manifest.in
old-configure.in
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -677,19 +677,16 @@
 @RESPATH@/browser/defaults/permissions
 
 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
 ; Technically this is an app pref file, but we are keeping it in the original
 ; gre location for now.
 @RESPATH@/defaults/pref/channel-prefs.js
 
 ; Services (gre) prefs
-#ifdef MOZ_SERVICES_NOTIFICATIONS
-@RESPATH@/defaults/pref/services-notifications.js
-#endif
 @RESPATH@/defaults/pref/services-sync.js
 
 ; [Layout Engine Resources]
 ; Style Sheets, Graphics and other Resources used by the layout engine.
 @RESPATH@/res/EditorOverride.css
 @RESPATH@/res/contenteditable.css
 @RESPATH@/res/designmode.css
 @RESPATH@/res/ImageDocument.css
--- a/old-configure.in
+++ b/old-configure.in
@@ -6613,22 +6613,16 @@ MOZ_ARG_DISABLE_BOOL(ctypes,
 [  --disable-ctypes        Disable js-ctypes],
     BUILD_CTYPES=,
     BUILD_CTYPES=1)
 AC_SUBST(BUILD_CTYPES)
 if test "$BUILD_CTYPES"; then
     AC_DEFINE(BUILD_CTYPES)
 fi
 
-dnl Build Notifications if required
-AC_SUBST(MOZ_SERVICES_NOTIFICATIONS)
-if test -n "$MOZ_SERVICES_NOTIFICATIONS"; then
-  AC_DEFINE(MOZ_SERVICES_NOTIFICATIONS)
-fi
-
 dnl Build Sync Services if required
 AC_SUBST(MOZ_SERVICES_SYNC)
 if test -n "$MOZ_SERVICES_SYNC"; then
   AC_DEFINE(MOZ_SERVICES_SYNC)
 fi
 
 dnl Build Services/CloudSync if required
 AC_SUBST(MOZ_SERVICES_CLOUDSYNC)