diff --git a/mailnews/base/build/nsMsgBaseCID.h b/mailnews/base/build/nsMsgBaseCID.h index 94af843d1905..6411c8937a4e 100644 --- a/mailnews/base/build/nsMsgBaseCID.h +++ b/mailnews/base/build/nsMsgBaseCID.h @@ -33,6 +33,12 @@ 0xa8f54ee0, 0xd292, 0x11d2, \ {0xb7, 0xf6, 0x00, 0x80, 0x5f, 0x05, 0xff, 0xa5}} +// +// nsMsgFolderDataSource +// +#define NS_MAILNEWSFOLDERDATASOURCE_PROGID \ + NS_RDF_DATASOURCE_PROGID_PREFIX "mailnewsfolders" + #define NS_MAILNEWSFOLDERDATASOURCE_CID \ { /* 2B8ED4A4-F684-11d2-8A5D-0060B0FC04D2 */ \ 0x2b8ed4a4, \ @@ -41,6 +47,12 @@ {0x8a, 0x5d, 0x0, 0x60, 0xb0, 0xfc, 0x4, 0xd2} \ } +// +// nsMsgMessageDataSource +// +#define NS_MAILNEWSMESSAGEDATASOURCE_PROGID \ + NS_RDF_DATASOURCE_PROGID_PREFIX "mailnewsmessages" + #define NS_MAILNEWSMESSAGEDATASOURCE_CID \ { /* 2B8ED4A5-F684-11d2-8A5D-0060B0FC04D2 */ \ 0x2b8ed4a5, \ @@ -49,63 +61,147 @@ {0x8a, 0x5d, 0x0, 0x60, 0xb0, 0xfc, 0x4, 0xd2} \ } + +// +// nsMessageViewDataSource +// +#define NS_MESSAGEVIEWDATASOURCE_PROGID \ + NS_RDF_DATASOURCE_PROGID_PREFIX "mail-messageview" + #define NS_MESSAGEVIEWDATASOURCE_CID \ { /* 14495573-E945-11d2-8A52-0060B0FC04D2 */ \ 0x14495573, 0xe945, 0x11d2, \ {0x8a, 0x52, 0x0, 0x60, 0xb0, 0xfc, 0x4, 0xd2}} + +// +// nsMsgAccountManager +// +#define NS_MSGACCOUNTMANAGER_PROGID \ + "component://netscape/messenger/account-manager" + #define NS_MSGACCOUNTMANAGER_CID \ { /* D2876E50-E62C-11d2-B7FC-00805F05FFA5 */ \ 0xd2876e50, 0xe62c, 0x11d2, \ {0xb7, 0xfc, 0x0, 0x80, 0x5f, 0x5, 0xff, 0xa5 }} +// +// nsMsgIdentity +// +#define NS_MSGIDENTITY_PROGID \ + "component://netscape/messenger/identity" + #define NS_MSGIDENTITY_CID \ { /* 8fbf6ac0-ebcc-11d2-b7fc-00805f05ffa5 */ \ 0x8fbf6ac0, 0xebcc, 0x11d2, \ {0xb7, 0xfc, 0x0, 0x80, 0x5f, 0x5, 0xff, 0xa5 }} +// +// nsMsgAccount +// +#define NS_MSGACCOUNT_PROGID \ + "component://netscape/messenger/account" + #define NS_MSGACCOUNT_CID \ { /* 68b25510-e641-11d2-b7fc-00805f05ffa5 */ \ 0x68b25510, 0xe641, 0x11d2, \ {0xb7, 0xfc, 0x0, 0x80, 0x5f, 0x5, 0xff, 0xa5 }} -// The filter service is used to acquire and manipulate filter lists. +// +// nsMsgFilterService +// +#define NS_MSGFILTERSERVICE_PROGID \ + "component://netscape/messenger/services/filters" + #define NS_MSGFILTERSERVICE_CID \ { 0x5cbb0700, 0x04bc, 0x11d3, \ { 0xa5, 0x0a, 0x0, 0x60, 0xb0, 0xfc, 0x04, 0xb7 } } + +// +// nsMsgSearchSession +// /* e9a7cd70-0303-11d3-a50a-0060b0fc04b7 */ #define NS_MSGSEARCHSESSION_CID \ { 0xe9a7cd70, 0x0303, 0x11d3, \ { 0xa5, 0x0a, 0x0, 0x60, 0xb0, 0xfc, 0x04, 0xb7 } } +// +// nsMsgMailSession +// +#define NS_MSGMAILSESSION_PROGID \ + "component://netscape/messenger/services/session" + /* D5124441-D59E-11d2-806A-006008128C4E */ #define NS_MSGMAILSESSION_CID \ { 0xd5124441, 0xd59e, 0x11d2, \ { 0x80, 0x6a, 0x0, 0x60, 0x8, 0x12, 0x8c, 0x4e } } +// +// nsMsgBiffManager +// +#define NS_MSGBIFFMANAGER_PROGID \ + "component://netscape/messenger/biffManager" + /* 4A374E7E-190F-11d3-8A88-0060B0FC04D2 */ #define NS_MSGBIFFMANAGER_CID \ { 0x4a374e7e, 0x190f, 0x11d3, \ { 0x8a, 0x88, 0x0, 0x60, 0xb0, 0xfc, 0x4, 0xd2 } } +// +// nsMsgNotificationManager +// +#define NS_MSGNOTIFICATIONMANAGER_PROGID \ + NS_RDF_DATASOURCE_PROGID_PREFIX "msgnotifications" + /* 7C601F60-1EF3-11d3-9574-006097222B83 */ #define NS_MSGNOTIFICATIONMANAGER_CID \ { 0x7c601f60, 0x1ef3, 0x11d3, \ { 0x95, 0x74, 0x0, 0x60, 0x97, 0x22, 0x2b, 0x83 } } +// +// nsCopyMessageStreamListener +// +#define NS_COPYMESSAGESTREAMLISTENER_PROGID \ + "component://netscape/messenger/copymessagestreamlistener" + #define NS_COPYMESSAGESTREAMLISTENER_CID \ { 0x7741daed, 0x2125, 0x11d3, \ { 0x8a, 0x90, 0x0, 0x60, 0xb0, 0xfc, 0x4, 0xd2 } } +// +// nsMsgCopyService +// +#define NS_MSGCOPYSERVICE_PROGID \ + "component://netscape/messenger/messagecopyservice" + /* c766e666-29bd-11d3-afb3-001083002da8 */ #define NS_MSGCOPYSERVICE_CID \ { 0xc766e666, 0x29bd, 0x11d3, \ { 0xaf, 0xb3, 0x00, 0x10, 0x83, 0x00, 0x2d, 0xa8 } } +// +// nsUrlListenerManager +// +#define NS_URLLISTENERMANAGER_PROGID \ + "component://netscape/messenger/urlListenerManager" + /* B1AA0820-D04B-11d2-8069-006008128C4E */ #define NS_URLLISTENERMANAGER_CID \ { 0xb1aa0820, 0xd04b, 0x11d2, \ {0x80, 0x69, 0x0, 0x60, 0x8, 0x12, 0x8c, 0x4e} } +// +// nsMessengerBootstrap +// +#define NS_MESSENGERBOOTSTRAP_PROGID \ + "component://netscape/appshell/component/messenger" + +// +// nsMessenger +// +#define NS_MESSENGER_PROGID \ + "component://netscape/messenger" + + #endif // nsMessageBaseCID_h__ diff --git a/mailnews/base/build/nsMsgFactory.cpp b/mailnews/base/build/nsMsgFactory.cpp index 51ef2ee243d3..e39eb5777458 100644 --- a/mailnews/base/build/nsMsgFactory.cpp +++ b/mailnews/base/build/nsMsgFactory.cpp @@ -350,13 +350,13 @@ NSRegisterSelf(nsISupports* aServMgr, const char* path) if (NS_FAILED(rv)) finalResult = rv; rv = compMgr->RegisterComponent(kCUrlListenerManagerCID, "UrlListenerManager", - "component://netscape/messenger/urlListenerManager", + NS_URLLISTENERMANAGER_PROGID, path, PR_TRUE, PR_TRUE); if (NS_FAILED(rv)) finalResult = rv; rv = compMgr->RegisterComponent(kCMessengerBootstrapCID, "Netscape Messenger Bootstrapper", - "component://netscape/appshell/component/messenger", + NS_MESSENGERBOOTSTRAP_PROGID, path, PR_TRUE, PR_TRUE); if ( NS_SUCCEEDED( rv ) ) { @@ -383,7 +383,7 @@ NSRegisterSelf(nsISupports* aServMgr, const char* path) rv = compMgr->RegisterComponent(kCMessengerCID, "Messenger DOM interaction object", - "component://netscape/messenger", + NS_MESSENGER_PROGID, path, PR_TRUE, PR_TRUE); if (NS_FAILED(rv)) finalResult = rv; @@ -391,7 +391,7 @@ NSRegisterSelf(nsISupports* aServMgr, const char* path) rv = compMgr->RegisterComponent(kMsgAccountManagerCID, "Messenger Account Manager", - "component://netscape/messenger/account-manager", + NS_MSGACCOUNTMANAGER_PROGID, path, PR_TRUE, PR_TRUE); if (NS_FAILED(rv)) finalResult = rv; @@ -401,21 +401,21 @@ NSRegisterSelf(nsISupports* aServMgr, const char* path) rv = compMgr->RegisterComponent(kMsgAccountCID, "Messenger User Account", - "component://netscape/messenger/account", + NS_MSGACCOUNT_PROGID, path, PR_TRUE, PR_TRUE); if (NS_FAILED(rv)) finalResult = rv; rv = compMgr->RegisterComponent(kMsgIdentityCID, "Messenger User Identity", - "component://netscape/messenger/identity", + NS_MSGIDENTITY_PROGID, path, PR_TRUE, PR_TRUE); if (NS_FAILED(rv)) finalResult = rv; rv = compMgr->RegisterComponent(kCMsgMailSessionCID, "Mail Session", - "component://netscape/messenger/services/session", + NS_MSGMAILSESSION_PROGID, path, PR_TRUE, PR_TRUE); if (NS_FAILED(rv)) finalResult = rv; @@ -423,20 +423,20 @@ NSRegisterSelf(nsISupports* aServMgr, const char* path) // register our RDF datasources: rv = compMgr->RegisterComponent(kMailNewsFolderDataSourceCID, "Mail/News Folder Data Source", - NS_RDF_DATASOURCE_PROGID_PREFIX "mailnewsfolders", + NS_MAILNEWSFOLDERDATASOURCE_PROGID, path, PR_TRUE, PR_TRUE); if (NS_FAILED(rv)) finalResult = rv; // register our RDF datasources: rv = compMgr->RegisterComponent(kMailNewsMessageDataSourceCID, "Mail/News Message Data Source", - NS_RDF_DATASOURCE_PROGID_PREFIX "mailnewsmessages", + NS_MAILNEWSMESSAGEDATASOURCE_PROGID, path, PR_TRUE, PR_TRUE); if (NS_FAILED(rv)) finalResult = rv; rv = compMgr->RegisterComponent(kCMessageViewDataSourceCID, "Mail/News Message View Data Source", - NS_RDF_DATASOURCE_PROGID_PREFIX "mail-messageview", + NS_MESSAGEVIEWDATASOURCE_PROGID, path, PR_TRUE, PR_TRUE); if (NS_FAILED(rv)) finalResult = rv; @@ -466,33 +466,33 @@ NSRegisterSelf(nsISupports* aServMgr, const char* path) printf("register filter service\n"); rv = compMgr->RegisterComponent(kMsgFilterServiceCID, "Message Filter Service", - "component://netscape/messenger/services/filters", + NS_MSGFILTERSERVICE_PROGID, path, PR_TRUE, PR_TRUE); if (NS_FAILED(rv)) finalResult = rv; #endif rv = compMgr->RegisterComponent(kMsgBiffManagerCID, "Messenger Biff Manager", - "component://netscape/messenger/biffManager", + NS_MSGBIFFMANAGER_PROGID, path, PR_TRUE, PR_TRUE); if (NS_FAILED(rv)) finalResult = rv; rv = compMgr->RegisterComponent(kMsgNotificationManagerCID, "Mail/News Notification Manager", - NS_RDF_DATASOURCE_PROGID_PREFIX "msgnotifications", + NS_MSGNOTIFICATIONMANAGER_PROGID, path, PR_TRUE, PR_TRUE); if (NS_FAILED(rv)) finalResult = rv; rv = compMgr->RegisterComponent(kCopyMessageStreamListenerCID, "Mail/News CopyMessage Stream Listener", - "component://netscape/messenger/copymessagestreamlistener", + NS_COPYMESSAGESTREAMLISTENER_PROGID, path, PR_TRUE, PR_TRUE); if (NS_FAILED(rv)) finalResult = rv; rv = compMgr->RegisterComponent(kMsgCopyServiceCID, "Mail/News Message Copy Service", - "component://netscape/messenger/messagecopyservice", + NS_MSGCOPYSERVICE_PROGID, path, PR_TRUE, PR_TRUE); if (NS_FAILED(rv)) finalResult = rv;