From cc9b998e09ccab7e283f1cc889cefac22240d0cd Mon Sep 17 00:00:00 2001
From: "chak%netscape.com"
 <chak%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 13 Mar 2001 06:29:32 +0000
Subject: [PATCH] Remaining Fixes for #68720 - EmbedAPI should use generic
 startup observers r=ccarlen,sr=alecf

git-svn-id: svn://10.0.0.236/trunk@89459 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/embedding/components/Makefile.in        | 2 +-
 mozilla/embedding/components/build/Makefile.in  | 4 +++-
 mozilla/embedding/components/build/makefile.win | 2 ++
 mozilla/embedding/components/build/nsModule.cpp | 8 +++++---
 mozilla/embedding/components/makefile.win       | 1 +
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/mozilla/embedding/components/Makefile.in b/mozilla/embedding/components/Makefile.in
index c21533e9635..9e8806a1bc7 100644
--- a/mozilla/embedding/components/Makefile.in
+++ b/mozilla/embedding/components/Makefile.in
@@ -24,6 +24,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = windowwatcher build
+DIRS = windowwatcher appstartup build
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/embedding/components/build/Makefile.in b/mozilla/embedding/components/build/Makefile.in
index c5889b35879..3fe12c85aac 100644
--- a/mozilla/embedding/components/build/Makefile.in
+++ b/mozilla/embedding/components/build/Makefile.in
@@ -27,7 +27,7 @@ MODULE		= embedcomponents
 LIBRARY_NAME	= embedcomponents
 SHORT_LIBNAME	= embedcmp
 IS_COMPONENT	= 1
-REQUIRES	= js xpcom string windowwatcher embed_base
+REQUIRES	= js xpcom string windowwatcher appstartupnotifier embed_base
 
 CPPSRCS		= nsModule.cpp
 
@@ -42,6 +42,7 @@ else
 
 SHARED_LIBRARY_LIBS = \
 	$(DIST)/lib/libwindowwatcher_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/libappstartupnotifier_s.$(LIB_SUFFIX) \
 	$(NULL)
 
 ifdef MOZ_PERF_METRICS
@@ -52,6 +53,7 @@ endif
 
 LOCAL_INCLUDES	= \
 	-I$(srcdir)/../windowwatcher/src  \
+	-I$(srcdir)/../appstartup/src  \
 	$(NULL)
 
 EXTRA_DSO_LDOPTS = \
diff --git a/mozilla/embedding/components/build/makefile.win b/mozilla/embedding/components/build/makefile.win
index 7919c349f4f..58cba14bf6a 100644
--- a/mozilla/embedding/components/build/makefile.win
+++ b/mozilla/embedding/components/build/makefile.win
@@ -36,10 +36,12 @@ LLIBS = \
         $(DIST)\lib\js3250.lib \
 	$(DIST)\lib\xpcom.lib \
 	$(DIST)\lib\windowwatcher_s.lib \
+	$(DIST)\lib\appstartupnotifier_s.lib \
 	$(NULL)
 
 INCS = $(INCS) \
 	-I$(DEPTH)\embedding\components\windowwatcher\src \
+	-I$(DEPTH)\embedding\components\appstartup\src \
 	$(NULL)
 
 include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/embedding/components/build/nsModule.cpp b/mozilla/embedding/components/build/nsModule.cpp
index 4b2335879c2..ee2a9cdbda0 100644
--- a/mozilla/embedding/components/build/nsModule.cpp
+++ b/mozilla/embedding/components/build/nsModule.cpp
@@ -22,13 +22,15 @@
 
 #include "nsIGenericFactory.h"
 #include "nsWindowWatcher.h"
+#include "nsAppStartupNotifier.h"
 
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsWindowWatcher, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsAppStartupNotifier)
 
 static nsModuleComponentInfo components[] = {
 
-  { "Window Watcher", NS_WINDOWWATCHER_CID, NS_WINDOWWATCHER_CONTRACTID, nsWindowWatcherConstructor }
+  { "Window Watcher", NS_WINDOWWATCHER_CID, NS_WINDOWWATCHER_CONTRACTID, nsWindowWatcherConstructor },
+  { NS_APPSTARTUPNOTIFIER_CLASSNAME, NS_APPSTARTUPNOTIFIER_CID, NS_APPSTARTUPNOTIFIER_CONTRACTID, nsAppStartupNotifierConstructor }
 };
 
-NS_IMPL_NSGETMODULE("windowwatcher", components)
-
+NS_IMPL_NSGETMODULE("embedcomponents", components)
diff --git a/mozilla/embedding/components/makefile.win b/mozilla/embedding/components/makefile.win
index 79ded08ca50..6f343158981 100644
--- a/mozilla/embedding/components/makefile.win
+++ b/mozilla/embedding/components/makefile.win
@@ -22,6 +22,7 @@ DEPTH=..\..
 
 DIRS= \
 	windowwatcher \
+	appstartup \
 	build \
 	$(NULL)