merging from SMARTUPDATE_BRANCH

cmd/xfe/mozilla.c

@@ -41,6 +41,9 @@
 #ifdef NSPR20
 #include "private/prpriv.h"	/* for PR_NewNamedMonitor */
 #endif /* NSPR20 */
+#ifdef MOZ_SMARTUPDATE
+#include "softupdt.h"
+#endif
 
 #include "libimg.h"             /* Image Library public API. */
 
@@ -2797,6 +2800,9 @@ main
     fe_splashUpdateText(XP_GetString(XFE_SPLASH_REGISTERING_CONVERTERS));
 #endif
 
+#ifdef MOZ_SMARTUPDATE
+  SU_Startup();
+#endif
   NR_StartupRegistry();
   fe_RegisterConverters ();  /* this must be before InstallPreferences(),
 				and after fe_InitializeGlobalResources(). */

cmd/xfe/xfe.c

@@ -76,6 +76,9 @@
 
 #include "prefapi.h"
 #include "NSReg.h"
+#ifdef MOZ_SMARTUPDATE
+#include "softupdt.h"
+#endif
 
 #if defined(_HPUX_SOURCE)
 /* I don't know where this is coming from...  "ld -y Error" says
@@ -2574,6 +2577,9 @@ fe_MinimalNoUICleanup()
 
   PREF_SavePrefFile();
   NR_ShutdownRegistry();
+#ifdef MOZ_SMARTUPDATE
+  SU_Shutdown();
+#endif
 
   RDF_Shutdown();
   GH_SaveGlobalHistory ();