Bug 506493 - Resync' configure.in between c-c and m-c; (Hv1a-TB-SB) Port bug 536567.
authorSerge Gautherie <sgautherie.bz@free.fr>
Tue, 23 Mar 2010 16:53:06 +0100
changeset 5241 4812530ad1f6fa5ca6e56bfe18047ad65d0d7082
parent 5240 a697b40649a300087a0ae08f9cc1fdf0e7d47aa0
child 5242 ed3132664862876533743761d11e8f021a915835
push id4046
push usersgautherie.bz@free.fr
push dateTue, 23 Mar 2010 15:58:56 +0000
treeherdercomm-central@ed3132664862 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs506493, 536567
Bug 506493 - Resync' configure.in between c-c and m-c; (Hv1a-TB-SB) Port bug 536567. r=standard8. Bug 536567 - Store the value of the per-site last file upload directories inside the memory while private browsing is active
calendar/installer/removed-files.in
calendar/installer/windows/packages-static
mail/installer/package-manifest.in
--- a/calendar/installer/removed-files.in
+++ b/calendar/installer/removed-files.in
@@ -475,8 +475,12 @@ js3250.dll
 #ifdef XP_MACOSX
 ../Plug-Ins/PrintPDE.plugin/Contents/Info.plist
 ../Plug-Ins/PrintPDE.plugin/Contents/MacOS/PrintPDE
 ../Plug-Ins/PrintPDE.plugin/Contents/Resources/English.lproj/Localizable.strings
 ../Plug-Ins/PrintPDE.plugin/Contents/Resources/English.lproj/PrintPDE.nib/classes.nib
 ../Plug-Ins/PrintPDE.plugin/Contents/Resources/English.lproj/PrintPDE.nib/info.nib
 ../Plug-Ins/PrintPDE.plugin/Contents/Resources/English.lproj/PrintPDE.nib/objects.xib
 #endif
+
+#ifndef MOZILLA_1_9_2_BRANCH
+components/contentprefs.xpt
+#endif
--- a/calendar/installer/windows/packages-static
+++ b/calendar/installer/windows/packages-static
@@ -79,17 +79,19 @@ bin\components\content_base.xpt
 bin\components\content_canvas.xpt
 #endif
 bin\components\content_events.xpt
 bin\components\content_html.xpt
 bin\components\content_htmldoc.xpt
 bin\components\content_xmldoc.xpt
 bin\components\content_xslt.xpt
 bin\components\content_xtf.xpt
+#ifdef MOZILLA_1_9_2_BRANCH
 bin\components\contentprefs.xpt
+#endif
 bin\components\cookie.xpt
 bin\components\docshell_base.xpt
 bin\components\dom.xpt
 bin\components\dom_base.xpt
 bin\components\dom_canvas.xpt
 bin\components\dom_core.xpt
 bin\components\dom_css.xpt
 bin\components\dom_events.xpt
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -316,17 +316,19 @@
 @BINPATH@/components/content_canvas.xpt
 #endif
 @BINPATH@/components/content_events.xpt
 @BINPATH@/components/content_html.xpt
 @BINPATH@/components/content_htmldoc.xpt
 @BINPATH@/components/content_xmldoc.xpt
 @BINPATH@/components/content_xslt.xpt
 @BINPATH@/components/content_xtf.xpt
+#ifdef MOZILLA_1_9_2_BRANCH
 @BINPATH@/components/contentprefs.xpt
+#endif
 @BINPATH@/components/htmlparser.xpt
 @BINPATH@/components/layout_base.xpt
 #ifdef NS_PRINTING
 @BINPATH@/components/layout_printing.xpt
 #endif
 @BINPATH@/components/layout_xul.xpt
 @BINPATH@/components/xulapp.xpt
 @BINPATH@/components/xuldoc.xpt