From 1b29b161a48e2d43243db25db94f90f2f5d04fcc Mon Sep 17 00:00:00 2001 From: "putterman%netscape.com" Date: Sat, 27 Feb 1999 07:15:41 +0000 Subject: [PATCH] Works with RegisterComponent git-svn-id: svn://10.0.0.236/trunk@22334 18797224-902f-48f8-a5cc-f745e15eee43 --- .../mailnews/compose/build/nsMsgCompFactory.cpp | 16 ++++++++-------- mozilla/mailnews/compose/tests/compose/test.cpp | 6 +++--- mozilla/mailnews/compose/tests/smtp/smtpTest.cpp | 4 ++-- mozilla/mailnews/mime/src/nsMimeFactory.cpp | 8 ++++---- .../mailnews/mime/tests/mailtest/mailtest.dsw | 2 +- mozilla/mailnews/mime/tests/xpcomtest/test.cpp | 4 ++-- mozilla/mailnews/news/tests/nntp/nntpTest.cpp | 4 ++-- .../mailnews/ui/compose/src/nsComposeAppCore.cpp | 9 ++++++--- 8 files changed, 28 insertions(+), 25 deletions(-) diff --git a/mozilla/mailnews/compose/build/nsMsgCompFactory.cpp b/mozilla/mailnews/compose/build/nsMsgCompFactory.cpp index 6fcef6937d4..493343c40b3 100644 --- a/mozilla/mailnews/compose/build/nsMsgCompFactory.cpp +++ b/mozilla/mailnews/compose/build/nsMsgCompFactory.cpp @@ -203,10 +203,10 @@ extern "C" NS_EXPORT nsresult NSRegisterSelf(nsISupports* serviceMgr, const char { nsresult ret; - ret = nsRepository::RegisterFactory(kCMsgComposeCID, path, PR_TRUE, PR_TRUE); - ret = nsRepository::RegisterFactory(kCSmtpServiceCID, path, PR_TRUE, PR_TRUE); - ret = nsRepository::RegisterFactory(kCMsgCompFieldsCID, path, PR_TRUE, PR_TRUE); - ret = nsRepository::RegisterFactory(kCMsgSendCID, path, PR_TRUE, PR_TRUE); + ret = nsRepository::RegisterComponent(kCMsgComposeCID, NULL, NULL, path, PR_TRUE, PR_TRUE); + ret = nsRepository::RegisterComponent(kCSmtpServiceCID, NULL, NULL, path, PR_TRUE, PR_TRUE); + ret = nsRepository::RegisterComponent(kCMsgCompFieldsCID, NULL, NULL, path, PR_TRUE, PR_TRUE); + ret = nsRepository::RegisterComponent(kCMsgSendCID, NULL, NULL, path, PR_TRUE, PR_TRUE); return ret; } @@ -216,10 +216,10 @@ NSUnregisterSelf(nsISupports* serviceMgr, const char* path) { nsresult ret; - ret = nsRepository::UnregisterFactory(kCMsgComposeCID, path); - ret = nsRepository::UnregisterFactory(kCSmtpServiceCID, path); - ret = nsRepository::UnregisterFactory(kCMsgCompFieldsCID, path); - ret = nsRepository::UnregisterFactory(kCMsgSendCID, path); + ret = nsRepository::UnregisterComponent(kCMsgComposeCID, path); + ret = nsRepository::UnregisterComponent(kCSmtpServiceCID, path); + ret = nsRepository::UnregisterComponent(kCMsgCompFieldsCID, path); + ret = nsRepository::UnregisterComponent(kCMsgSendCID, path); return ret; } diff --git a/mozilla/mailnews/compose/tests/compose/test.cpp b/mozilla/mailnews/compose/tests/compose/test.cpp index 513b78d1085..f24918b4ae0 100644 --- a/mozilla/mailnews/compose/tests/compose/test.cpp +++ b/mozilla/mailnews/compose/tests/compose/test.cpp @@ -29,9 +29,9 @@ static NS_DEFINE_CID(kMsgSendCID, NS_MSGSEND_CID); nsresult res; // register our dll - nsRepository::RegisterFactory(kMsgComposeCID, "msgcompose.dll", PR_FALSE, PR_FALSE); - nsRepository::RegisterFactory(kMsgCompFieldsCID, "msgcompose.dll", PR_FALSE, PR_FALSE); - nsRepository::RegisterFactory(kMsgSendCID, "msgcompose.dll", PR_FALSE, PR_FALSE); + nsRepository::RegisterComponent(kMsgComposeCID, NULL, NULL, "msgcompose.dll", PR_FALSE, PR_FALSE); + nsRepository::RegisterComponent(kMsgCompFieldsCID, NULL, NULL, "msgcompose.dll", PR_FALSE, PR_FALSE); + nsRepository::RegisterComponent(kMsgSendCID, NULL, NULL, "msgcompose.dll", PR_FALSE, PR_FALSE); res = nsRepository::CreateInstance(kMsgCompFieldsCID, NULL, diff --git a/mozilla/mailnews/compose/tests/smtp/smtpTest.cpp b/mozilla/mailnews/compose/tests/smtp/smtpTest.cpp index bbe09a13a13..050c9ee1594 100644 --- a/mozilla/mailnews/compose/tests/smtp/smtpTest.cpp +++ b/mozilla/mailnews/compose/tests/smtp/smtpTest.cpp @@ -395,8 +395,8 @@ int main() PLEventQueue *queue; nsresult result; - nsRepository::RegisterFactory(kNetServiceCID, NETLIB_DLL, PR_FALSE, PR_FALSE); - nsRepository::RegisterFactory(kEventQueueServiceCID, XPCOM_DLL, PR_FALSE, PR_FALSE); + nsRepository::RegisterComponent(kNetServiceCID, NULL, NULL, NETLIB_DLL, PR_FALSE, PR_FALSE); + nsRepository::RegisterComponent(kEventQueueServiceCID, NULL, NULL, XPCOM_DLL, PR_FALSE, PR_FALSE); // Create the Event Queue for this thread... nsIEventQueueService *pEventQService = nsnull; diff --git a/mozilla/mailnews/mime/src/nsMimeFactory.cpp b/mozilla/mailnews/mime/src/nsMimeFactory.cpp index 30733660af4..1cd21297123 100644 --- a/mozilla/mailnews/mime/src/nsMimeFactory.cpp +++ b/mozilla/mailnews/mime/src/nsMimeFactory.cpp @@ -184,9 +184,9 @@ extern NET_StreamClass *MIME_MessageConverter(int format_out, void *closure, extern "C" NS_EXPORT nsresult NSRegisterSelf(nsISupports* serviceMgr, const char *path) { printf("*** Mime being registered\n"); - nsRepository::RegisterFactory(kCMimeMimeObjectClassAccessCID, path, + nsRepository::RegisterComponent(kCMimeMimeObjectClassAccessCID, NULL, NULL, path, PR_TRUE, PR_TRUE); - nsRepository::RegisterFactory(kCMimeRFC822HTMLConverterCID, path, + nsRepository::RegisterComponent(kCMimeRFC822HTMLConverterCID, NULL, NULL, path, PR_TRUE, PR_TRUE); /* @@ -202,8 +202,8 @@ extern "C" NS_EXPORT nsresult NSRegisterSelf(nsISupports* serviceMgr, const char extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* serviceMgr, const char *path) { printf("*** Mime being unregistered\n"); - nsRepository::UnregisterFactory(kCMimeMimeObjectClassAccessCID, path); - nsRepository::UnregisterFactory(kCMimeRFC822HTMLConverterCID, path); + nsRepository::UnregisterComponent(kCMimeMimeObjectClassAccessCID, path); + nsRepository::UnregisterComponent(kCMimeRFC822HTMLConverterCID, path); return NS_OK; } diff --git a/mozilla/mailnews/mime/tests/mailtest/mailtest.dsw b/mozilla/mailnews/mime/tests/mailtest/mailtest.dsw index b42c0abfec6..aa932411c5a 100644 --- a/mozilla/mailnews/mime/tests/mailtest/mailtest.dsw +++ b/mozilla/mailnews/mime/tests/mailtest/mailtest.dsw @@ -1,4 +1,4 @@ -Microsoft Developer Studio Workspace File, Format Version 5.00 +Microsoft Developer Studio Workspace File, Format Version 6.00 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! ############################################################################### diff --git a/mozilla/mailnews/mime/tests/xpcomtest/test.cpp b/mozilla/mailnews/mime/tests/xpcomtest/test.cpp index 419ad26fe42..be90532047f 100644 --- a/mozilla/mailnews/mime/tests/xpcomtest/test.cpp +++ b/mozilla/mailnews/mime/tests/xpcomtest/test.cpp @@ -16,9 +16,9 @@ int main(int argc, char *argv[]) nsMimeObjectClassAccess *objAccess; // register our dll - nsRepository::RegisterFactory(kRFC822toHTMLStreamConverterCID, + nsRepository::RegisterComponent(kRFC822toHTMLStreamConverterCID, NULL, NULL, "mime.dll", PR_FALSE, PR_FALSE); - nsRepository::RegisterFactory(kMimeObjectClassAccessCID, + nsRepository::RegisterComponent(kMimeObjectClassAccessCID, NULL, NULL, "mime.dll", PR_FALSE, PR_FALSE); nsresult res = nsRepository::CreateInstance(kRFC822toHTMLStreamConverterCID, diff --git a/mozilla/mailnews/news/tests/nntp/nntpTest.cpp b/mozilla/mailnews/news/tests/nntp/nntpTest.cpp index 97c9f22eaa8..451e1b1bcaf 100644 --- a/mozilla/mailnews/news/tests/nntp/nntpTest.cpp +++ b/mozilla/mailnews/news/tests/nntp/nntpTest.cpp @@ -653,8 +653,8 @@ int main() PLEventQueue *queue; nsresult result; - nsRepository::RegisterFactory(kNetServiceCID, NETLIB_DLL, PR_FALSE, PR_FALSE); - nsRepository::RegisterFactory(kEventQueueServiceCID, XPCOM_DLL, PR_FALSE, PR_FALSE); + nsRepository::RegisterComponent(kNetServiceCID, NULL, NULL, NETLIB_DLL, PR_FALSE, PR_FALSE); + nsRepository::RegisterComponent(kEventQueueServiceCID, NULL, NULL, XPCOM_DLL, PR_FALSE, PR_FALSE); // Create the Event Queue for this thread... nsIEventQueueService *pEventQService = nsnull; diff --git a/mozilla/mailnews/ui/compose/src/nsComposeAppCore.cpp b/mozilla/mailnews/ui/compose/src/nsComposeAppCore.cpp index 902a43734c1..23556d4302c 100644 --- a/mozilla/mailnews/ui/compose/src/nsComposeAppCore.cpp +++ b/mozilla/mailnews/ui/compose/src/nsComposeAppCore.cpp @@ -313,16 +313,19 @@ nsComposeAppCore::SendMessage(const nsString& aAddrFrom, const nsString& aSmtp, // register our dll const char* compose_dll = "msgcompose.dll"; - nsRepository::RegisterFactory(kMsgComposeCID, + nsRepository::RegisterComponent(kMsgComposeCID, "Netscape Mail Composer AppCore", + NULL, compose_dll, PR_FALSE, PR_FALSE); - nsRepository::RegisterFactory(kMsgCompFieldsCID, + nsRepository::RegisterComponent(kMsgCompFieldsCID, "Netscape Mail Composer Fields", + NULL, compose_dll, PR_FALSE, PR_FALSE); - nsRepository::RegisterFactory(kMsgSendCID, + nsRepository::RegisterComponent(kMsgSendCID, "Netscape Mail Sender", + NULL, compose_dll, PR_FALSE, PR_FALSE);