From 39a2ecfa89981b4636aa9c9b39ae102031205f02 Mon Sep 17 00:00:00 2001
From: "danm%netscape.com" <danm%netscape.com>
Date: Thu, 5 Apr 2001 23:09:35 +0000
Subject: [PATCH] new embedding promptservice component. bug 72112
 r=hyatt,pinkerton

---
 allmakefiles.sh                               |   3 ++
 build/mac/build_scripts/MozillaBuildList.pm   |   1 +
 embedding/components/Makefile.in              |   2 +-
 embedding/components/build/Makefile.in        |   5 ++-
 .../build/macbuild/EmbedComponents.mcp        | Bin 112506 -> 112506 bytes
 .../build/macbuild/EmbedComponentsIDL.mcp     | Bin 58927 -> 57647 bytes
 embedding/components/build/makefile.win       |   2 +
 embedding/components/build/nsModule.cpp       |   3 ++
 embedding/components/makefile.win             |   1 +
 .../components/promptservice/Makefile.in      |   0
 .../components/promptservice/makefile.win     |   0
 .../promptservice/public/MANIFEST_IDL         |   0
 .../promptservice/public/Makefile.in          |   0
 .../promptservice/public/makefile.win         |   0
 .../promptservice/public/nsIPromptService.idl |   0
 .../components/promptservice/src/Makefile.in  |  40 ++++++++++++++++++
 .../components/promptservice/src/makefile.win |   0
 .../promptservice/src/nsPromptService.cpp     |   0
 .../promptservice/src/nsPromptService.h       |   0
 19 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 embedding/components/promptservice/Makefile.in
 create mode 100644 embedding/components/promptservice/makefile.win
 create mode 100644 embedding/components/promptservice/public/MANIFEST_IDL
 create mode 100644 embedding/components/promptservice/public/Makefile.in
 create mode 100644 embedding/components/promptservice/public/makefile.win
 create mode 100644 embedding/components/promptservice/public/nsIPromptService.idl
 create mode 100644 embedding/components/promptservice/src/Makefile.in
 create mode 100644 embedding/components/promptservice/src/makefile.win
 create mode 100644 embedding/components/promptservice/src/nsPromptService.cpp
 create mode 100644 embedding/components/promptservice/src/nsPromptService.h

diff --git a/allmakefiles.sh b/allmakefiles.sh
index 2792a385310..b7dc071e3f1 100755
--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@@ -745,6 +745,9 @@ embedding/browser/photon/src/Makefile
 embedding/browser/photon/tests/Makefile
 embedding/components/Makefile
 embedding/components/build/Makefile
+embedding/components/promptservice/Makefile
+embedding/components/promptservice/public/Makefile
+embedding/components/promptservice/src/Makefile
 embedding/components/windowwatcher/Makefile
 embedding/components/windowwatcher/public/Makefile
 embedding/components/windowwatcher/src/Makefile
diff --git a/build/mac/build_scripts/MozillaBuildList.pm b/build/mac/build_scripts/MozillaBuildList.pm
index 060b3469812..bf323b47b23 100644
--- a/build/mac/build_scripts/MozillaBuildList.pm
+++ b/build/mac/build_scripts/MozillaBuildList.pm
@@ -719,6 +719,7 @@ sub BuildClientDist()
     #EMBEDDING
     InstallFromManifest(":mozilla:embedding:base:MANIFEST_IDL",                    "$distdirectory:idl:");
     InstallFromManifest(":mozilla:embedding:browser:webbrowser:MANIFEST_IDL",      "$distdirectory:idl:");
+    InstallFromManifest(":mozilla:embedding:components:promptservice:public:MANIFEST_IDL", "$distdirectory:idl:");
     InstallFromManifest(":mozilla:embedding:components:windowwatcher:public:MANIFEST_IDL", "$distdirectory:idl:");
     InstallFromManifest(":mozilla:embedding:components:appstartup:src:MANIFEST",   "$distdirectory:embedding:components:");
 
diff --git a/embedding/components/Makefile.in b/embedding/components/Makefile.in
index 9e8806a1bc7..1fa8f6af894 100644
--- a/embedding/components/Makefile.in
+++ b/embedding/components/Makefile.in
@@ -24,6 +24,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = windowwatcher appstartup build
+DIRS = promptservice windowwatcher appstartup build
 
 include $(topsrcdir)/config/rules.mk
diff --git a/embedding/components/build/Makefile.in b/embedding/components/build/Makefile.in
index 07c2d483d7d..a4f17da5753 100644
--- a/embedding/components/build/Makefile.in
+++ b/embedding/components/build/Makefile.in
@@ -27,12 +27,13 @@ MODULE		= embedcomponents
 LIBRARY_NAME	= embedcomponents
 SHORT_LIBNAME	= embedcmp
 IS_COMPONENT	= 1
-REQUIRES	= js xpcom string windowwatcher embed_base
+REQUIRES	= js xpcom string promptservice windowwatcher embed_base
 
 CPPSRCS		= nsModule.cpp
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 EXTRA_DSO_LIBS	= \
+	promptservice_s \
 	windowwatcher_s \
 	appstartupnotifier_s \
 	$(NULL)
@@ -45,6 +46,7 @@ endif
 else
 
 SHARED_LIBRARY_LIBS = \
+	$(DIST)/lib/libpromptservice_s.$(LIB_SUFFIX) \
 	$(DIST)/lib/libwindowwatcher_s.$(LIB_SUFFIX) \
 	$(DIST)/lib/libappstartupnotifier_s.$(LIB_SUFFIX) \
 	$(NULL)
@@ -56,6 +58,7 @@ endif
 endif
 
 LOCAL_INCLUDES	= \
+	-I$(srcdir)/../promptservice/src  \
 	-I$(srcdir)/../windowwatcher/src  \
 	-I$(srcdir)/../appstartup/src  \
 	$(NULL)
diff --git a/embedding/components/build/macbuild/EmbedComponents.mcp b/embedding/components/build/macbuild/EmbedComponents.mcp
index 28e6ed0d4fba7d2f946e91cdcc2c2529018d1584..4f45ae9e9016bd87fd1bf26628e415ca8b67e7d0 100644
GIT binary patch
delta 740
zcmZ8fT}YEr7(VaWx9{_3n?DnWO>4W*A_jURm|oQUE7RPEle`J1)Ut(}V}3J(F6u^1
zyl@=ou$zn`(hQlN^b0ByiXf=)sxAzTu0le@pq2&peoHUx9L_oK5AXXt=Q(G4L*Cwy
zQ!`+-5JFsl8?F}i1UyBCfqo`I(ZJOv(lBK<D<9D1y$<ju)YkksI@bwN)(Oc%Gm|J5
zU0K6s(AZn+3Y)Rnl&zB^gk;|oOSWN&xwAb|rrRZZ0~C-e&-;$=O~ePLmO919q6v%H
zz>l*RewP?`->Aro463n#a8&aLV?&|yL7uWgDO<J`h@Rm$APP^PqsmtKQ^a{7dXv9_
zMca#wz|PM42@L!KF`|}GhjBw<?eO_J4YqqjVLtmAr`5U-0h7?&($-{1Arkfja99fj
z^5j6O!5h~G{8}s&>1!S$eyumAc?SnWeUWf5qSaqLD*~NkHMxd#QU=bZA9O*T1Vk*S
zEmXp|Riu76sBA%5p%&RGlx<#+n3~LHl_lk@{?_+|`qBsqHR+RuufNd5H^X3_pD2?P
zs&h9}XA;%iK}9r~1~GdN0HtUI@p<i)iQVbS73yMtIsbGF{Jg6cRQ|ITj<C!AO>-ME
zh$Bg_2}>oDXkG5f67FxEvht5_p18KPkFE{rmQZ}P|Hz7h9qLXr9pc>%Xw-|VVF7fz
z3*L`H75_2?cjb;r)NqN9O~X;T@{BJ|LuJ`lM9&Xv(GZ@-&)OaK8Z@eO`VeLnnlsAh
z=dk8aT3?-mchpJ7u`Fja8Vg<|wzU=Pdg@=@<Zb@?F?7@W^LoVstODgxF6+=tA9;AY
G4xYc+Z{Otr

delta 558
zcmXw0O=wd=5Z>9opTxYryfn3~q|t<86bX3gp-@l|wZ&rc2!Vi#&A|wwLZU??c!(ZE
zN)JA_xG2&Dd$6@2#;JLN9(oYLgC(?}La`R{;6Y09q(O|6S_fw4+wYqhc4r&wT4P;%
zItT4O##jU>kPnL&5bq?sNpb?@Ba|5agc()zWUn}O$QmP}#F+k`F;7brfovCMJVjM3
zw|{hOMa-F|zPzW_Y)<{b1+%Dhw}vw#l}x5v_5V#1wbXHZ5cES}=X{+Fh3=CA{*x3y
z*u5eA(0SWX4-t7@jHV+v5xpLhmkkIzwkhgn0JFunfE~w9acyZ*W9)=17_bX%=M#v0
zqDx<z>|iV$!0Plbz?=3Cj;~f;f_kJi5J%JF16VHid$AyU024WbJGM`3oKeuem(;M5
z2`KJ?s{nv@ZX0QSTznLvgQLJ!)nFT9$x`VWhl#JgZWEP^5AE88-8fa=uHnM;2H;3N
z>%r*vw5F?@TQKq3k3j{8gvG@{;c*KwusG=MjlIy#!Ha8+P@fx&z~U{4%P%wVPzw&w
zLP~Oc7WVN}S=MG@fA}lC!MZq>KS#OsPg~}V5{SF}F+9<^QIXH8)YG)w)hfK>A&AgE
tj7t7e?kqDuuh7)te|;0*<ePao&F}nnW6xm~_}yNqxp0)rewlC~{ufqLrPu%f

diff --git a/embedding/components/build/macbuild/EmbedComponentsIDL.mcp b/embedding/components/build/macbuild/EmbedComponentsIDL.mcp
index 4c0352d1dfb181527857c6d4779f372f2545f7f8..10b4a49319d296a53c8e43045d4eb66029961edf 100644
GIT binary patch
delta 2101
zcma)+YfM~46vt=w!7l9GM+=%lZMf{V1quPI#K+R&0)o_1o*K2#g1~km;jznZ`l1Sn
ziBQv);P|ODRzreKtP(Q~=?85{8{0-vNt!DCAkfyN7@M>K<6GDN+__8E_@PcR_ni67
zx$`*ZfA8dsaq^-uxvjUiix6TYgk}-)?G-}iK2BEcG=mk`YpBYO*xzSCkC_!XEH=cU
z8PJVvu>L@~37$&vKzE`ipxe+LVhrp?_u&OBEJC%huv$~DO{gEJ#KcmZ9)p?klJ|_1
z5|-)m<(OkJn$<=Wdtg;WXpIU7owB!FIW8S)GdLaPU%L9OyfS@-KGqZ7QQOzs9gH;i
z`}TLX`SUv4yNFk`_Res`>+f#$x3_op1iWns>h1COM8f=L=1t0K)>!$}t6{p9u3+5^
zxvjwp>*gU(7Y@Mg&t+P%wMa__OTVF-FmSM*v`n+Oyebf%J%8802R#QUl4xQd9ZX4d
zPc7SqqS4_}Eb|9tmk&Q|Sx$VKkZ`gDJ3S7|a(Qz!IyTB%JP#R?6)a{HmnR86bdd-g
z5wA|CI+*Kd68l;lgWu0q3?j>BKAV|pFdE{ce8-b`et~MT=~wg;e;?NPk#dyQfJ530
zd}K^Dvhmc@%o+HCA3A-JvV~wSKeb;mu+2A8M{6DI-dv73c3BS<H{EDOy8m<8e(kbU
z)5so8BZv~RaiS-n+t3|itlf&#*VH_ZfYoNI*iluE`zGktrdx+@ogyQ?X!Q3M_K0(R
zOgsGem|I++*!^Jn@TQQJ^1Bn&c0S!)YhgtbZAmdjK~v_yb*)?<PHb88Z`omEKH4#E
z89#B7^1@I7<+B&k(^AO)tdTYMK{YZPSr&CNHI%{zJ@dSSxeO@AjFH(w*`u{ZsM1+8
z3e&&`BPPm=CeCeT_r7~BEwxg7V%_0LAGETxnn|*uk~PfdrKy-UlkP}ReCk3;dUHI^
z#^&=kOkwE4Y$t5|>}A2(o%x(czk!#9<q;9T{3fw&VRs~eb>n&V5mvU4H{kdiuUUhA
z{(U5AOFsMzbTnrI9%+(~d<NewC?Pp#M7ZQjBLE%^lfrcnLyF`-Gq8=4_qAaeRpT}_
z5p0v>P8IjC1aq{F-9G_tmJ{AwoYy56TATsPl)QKwTfcZBt)vOVVmUo@2Y#NMcI{)A
z7B38xoW!tIPXF2f{|S9M0xOSaOUI9tJgM_x*d!T0zZU*eI{yS#k-YUfe6Qpsf5Lt)
z`I}+*MUt1I4s>0xQM=9|@wsi26J_(TXXFc?`rvPu{Fygk^CUlC2ftY7=kOWo8&5jG
z@Y@lsVwyGH+FM<*6sHn=p0TzQoD4!A;!JV8ssrPgZsPet!MWx3R@z!6a^S123P(uN
zvIYJt=xDC1ct~j|qbM&a5tNWB!KE~m<=^0!3QEYa*H@*XTow5((=d5^g^himH&As;
ztGLLJa><9O3OU^crI=;Gm8m7LXC>eD0|YCTW3T@UtWxqip(3dO<u#G%YMqPs99l;0
zl_H}xk_SXgYj8l@__mPci*lmw1z4#GWmx3nCCLLJSg8r+-LK%ktn+?YSsMFpQO4am
zAA*&dP+G*#w^8yj<Pw_D_C34315jue?NmA*QWJL5F8F%{C8R@~T53XRIt+iWpoqV+
ZstM(26rfqd<eh7<S#pD47T~uC{txj%s=@#O

delta 1969
zcma)-e@t6d6vyv<1xm|n`y4Q#Iw&AgB$h$Qm^iSEQM(MGutjj}CpZep$jUFbNgSe!
zW5$5wX1auiF{TWSk+_>oVx}=J#s#PG9}^G;B$$lEE!&t;mSxuOeYcxr`iHl<=braD
z=l(e7p7%QTjbZGvA-4X&f&GLK10mE&$jo<yT=^{4VPW}}GIq@J0h{;4FqhS&D1;Rk
z*(qhGGdoM+O&k;g-HaZEZW6kJQP|Mku-+yl0xF*OwYD`j1)LSt<-1GDD#}YUEuHKy
zYZ|rm7iY3##c|AAX=MY&b+M7cpXxtCu_PL6@jsfNACWk)0YMiVMWLG%mZ7;>RilfY
z(45-Cllc!?XEZB+B<jVgii&OeVqszMY%VLs@=@W@6duhtX({$ErQH<%bQ|p^ShOo7
zru|EX58uJOj;u%#cQW%i(jv{!9MBy6r}1kFAIcb}+?#ltviOc9?#^4HtSi%M<f+r4
z(A{eO@p!z#TK%ipY%nQK#ncD{Pe`O2U8JFa=j0g`cB(g)-^gC27zHXQsOOVUtBMLI
z;V#HQ&U;lQ0>p4GH$RHa*)4q2`rjyTXic*7g)$?hCYBOR?e{tOSmoY$*5jXGj^L=C
z`SG194>q1OvadbPeji+M&4<}XBQB<Wn89;faw#t?au|5@Kmz5Lf~vwcr`t_Q=XvZ~
zgfs+k#JiOFGgcb`LZJ(v1AMRWiZz{-zn{@f*_QMKc#qJ9Q0VBwKi=oA<G4*z0C(vB
zk6lJ8VmE|im)W3helI6Ek~yi3`C=m2^}#LuzB7FJq^9Wc^Do8~1D}t#&@*`f$~P3H
z7<kR_I|`o&niX8kEy`=$k(6ovdOkQ(nadVE_pkM)=RdA>kg{8oUVE}vTtahOdn*pK
zNFKD;&a$mjF1vlBxX9-AfOyShLF+EoGBz-kz2-6=G+3J+vd-XHWml)Na;`yhVtIJ1
zT>j8mY@65I?#H?-d777%{Nn1e#bH`>pmkpZF+Y_JJp~=j_Be!H^1g4OrwU3)`Y7J2
z9?2K`0Mc|!)~>}%5-0f|4D1QX*KNWw4xPt1MD3?b?t2+g8UtDS#;LypJ}C|RF)>1u
z3(bqDGbC@VXOB(y+HLFbSR~EIu0nT7v#p(7oc^lI_68p7q<MKO^!%{-SB&y_G0Eby
zv_8z2F`A|S>?-KbNUq_dK~%}>euiEkx!;CyLh`rUpg${l$D0TzAyBJ_b67ZSkOu!0
z#!)%pOE>gF$+ZTIF3HC$p%+R1$^brG;f=?vV9!Y&$YZrvc9l=wSWzY7jNum80p)en
zhd9#;u8Ae?*Ud_v1g>)9Y%Z-!L}3!QudJ<|n3s&u_oAa&MXF_KsQvh`l43y#N$i1;
zrJ*j}fxb~tLXJ*9C=K<J$Zv^`Nnbr1m~(ZVIH=#a$dG!`4U<Qj-#dbk<b|u}#e4C*
z<O97ZSXnuis(WDKm}rT^5V8W)BO=q~g5tO$gH}DG7O%)?g`n`Cho}p5=^HPgx=1xT
znsxy~)`Z$~2zrg6sL*x@Srh8ekI-Kd6dVT)*Mw!exW?^*5;FKHgscg5PYm>0K?ym9
zHBl4#zMm8}f{05(8+sQ))`TVE1?W2kB_uEdA!|b2@hbFPf)a8X$qd(odR+X)?A9@9
Q5&s}gxxt@v(Dw-bHy=r&!~g&Q

diff --git a/embedding/components/build/makefile.win b/embedding/components/build/makefile.win
index 58cba14bf6a..f75a15f2374 100644
--- a/embedding/components/build/makefile.win
+++ b/embedding/components/build/makefile.win
@@ -35,11 +35,13 @@ LLIBS = \
 	$(LIBNSPR) \
         $(DIST)\lib\js3250.lib \
 	$(DIST)\lib\xpcom.lib \
+	$(DIST)\lib\promptservice_s.lib \
 	$(DIST)\lib\windowwatcher_s.lib \
 	$(DIST)\lib\appstartupnotifier_s.lib \
 	$(NULL)
 
 INCS = $(INCS) \
+	-I$(DEPTH)\embedding\components\promptservice\src \
 	-I$(DEPTH)\embedding\components\windowwatcher\src \
 	-I$(DEPTH)\embedding\components\appstartup\src \
 	$(NULL)
diff --git a/embedding/components/build/nsModule.cpp b/embedding/components/build/nsModule.cpp
index 7ed9a0d279a..7ba88a3f1b5 100644
--- a/embedding/components/build/nsModule.cpp
+++ b/embedding/components/build/nsModule.cpp
@@ -21,14 +21,17 @@
  */
 
 #include "nsIGenericFactory.h"
+#include "nsPromptService.h"
 #include "nsWindowWatcher.h"
 #include "nsAppStartupNotifier.h"
 
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPromptService, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsWindowWatcher, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAppStartupNotifier)
 
 static nsModuleComponentInfo components[] = {
 
+  { "Prompt Service", NS_PROMPTSERVICE_CID, NS_PROMPTSERVICE_CONTRACTID, nsPromptServiceConstructor },
   { "Window Watcher", NS_WINDOWWATCHER_CID, NS_WINDOWWATCHER_CONTRACTID, nsWindowWatcherConstructor },
   { NS_APPSTARTUPNOTIFIER_CLASSNAME, NS_APPSTARTUPNOTIFIER_CID, NS_APPSTARTUPNOTIFIER_CONTRACTID, nsAppStartupNotifierConstructor }
 };
diff --git a/embedding/components/makefile.win b/embedding/components/makefile.win
index 6f343158981..e2d153a85f9 100644
--- a/embedding/components/makefile.win
+++ b/embedding/components/makefile.win
@@ -21,6 +21,7 @@
 DEPTH=..\..
 
 DIRS= \
+	promptservice \
 	windowwatcher \
 	appstartup \
 	build \
diff --git a/embedding/components/promptservice/Makefile.in b/embedding/components/promptservice/Makefile.in
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/embedding/components/promptservice/makefile.win b/embedding/components/promptservice/makefile.win
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/embedding/components/promptservice/public/MANIFEST_IDL b/embedding/components/promptservice/public/MANIFEST_IDL
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/embedding/components/promptservice/public/Makefile.in b/embedding/components/promptservice/public/Makefile.in
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/embedding/components/promptservice/public/makefile.win b/embedding/components/promptservice/public/makefile.win
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/embedding/components/promptservice/public/nsIPromptService.idl b/embedding/components/promptservice/public/nsIPromptService.idl
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/embedding/components/promptservice/src/Makefile.in b/embedding/components/promptservice/src/Makefile.in
new file mode 100644
index 00000000000..fcafc389ec8
--- /dev/null
+++ b/embedding/components/promptservice/src/Makefile.in
@@ -0,0 +1,40 @@
+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications, Inc.  Portions created by Netscape are
+# Copyright (C) 2001, Mozilla.  All Rights Reserved.
+# 
+# Contributor(s):
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= embedcomponents
+LIBRARY_NAME	= promptservice_s
+REQUIRES	= xpcom string dom promptservice widget js xpconnect caps layout uriloader necko docshell locale webbrwsr embed_base gfx2
+
+CPPSRCS		= nsPromptService.cpp \
+                  $(NULL)
+
+# we don't want the shared lib, but we want to force the creation of a
+# static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
+
+include $(topsrcdir)/config/rules.mk
+
diff --git a/embedding/components/promptservice/src/makefile.win b/embedding/components/promptservice/src/makefile.win
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/embedding/components/promptservice/src/nsPromptService.cpp b/embedding/components/promptservice/src/nsPromptService.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/embedding/components/promptservice/src/nsPromptService.h b/embedding/components/promptservice/src/nsPromptService.h
new file mode 100644
index 00000000000..e69de29bb2d