diff --git a/db/mork/Makefile.in b/db/mork/Makefile.in index 0a9ceea9fa64..7941d7447a76 100644 --- a/db/mork/Makefile.in +++ b/db/mork/Makefile.in @@ -22,7 +22,7 @@ srcdir = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = public src +DIRS = public src build ifdef ENABLE_TESTS DIRS += tests diff --git a/db/mork/makefile.win b/db/mork/makefile.win index 87b678e54ce7..293f4e604d30 100644 --- a/db/mork/makefile.win +++ b/db/mork/makefile.win @@ -19,6 +19,6 @@ DEPTH=..\..\.. #tests no tests yet or public yet -DIRS=src +DIRS=src build include <$(DEPTH)\config\rules.mak> diff --git a/db/mork/src/makefile.win b/db/mork/src/makefile.win index 413ccc8b81da..1ebf28789bfd 100644 --- a/db/mork/src/makefile.win +++ b/db/mork/src/makefile.win @@ -12,7 +12,7 @@ # # The Initial Developer of this code under the NPL is Netscape # Communications Corporation. Portions created by Netscape are -# Copyright (C) 1998 Netscape Communications Corporation. All Rights +# Copyright (C) 1998-1999 Netscape Communications Corporation. All Rights # Reserved. diff --git a/mailnews/db/mork/Makefile.in b/mailnews/db/mork/Makefile.in index 0a9ceea9fa64..7941d7447a76 100644 --- a/mailnews/db/mork/Makefile.in +++ b/mailnews/db/mork/Makefile.in @@ -22,7 +22,7 @@ srcdir = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = public src +DIRS = public src build ifdef ENABLE_TESTS DIRS += tests diff --git a/mailnews/db/mork/makefile.win b/mailnews/db/mork/makefile.win index 87b678e54ce7..293f4e604d30 100644 --- a/mailnews/db/mork/makefile.win +++ b/mailnews/db/mork/makefile.win @@ -19,6 +19,6 @@ DEPTH=..\..\.. #tests no tests yet or public yet -DIRS=src +DIRS=src build include <$(DEPTH)\config\rules.mak> diff --git a/mailnews/db/mork/src/makefile.win b/mailnews/db/mork/src/makefile.win index 413ccc8b81da..1ebf28789bfd 100644 --- a/mailnews/db/mork/src/makefile.win +++ b/mailnews/db/mork/src/makefile.win @@ -12,7 +12,7 @@ # # The Initial Developer of this code under the NPL is Netscape # Communications Corporation. Portions created by Netscape are -# Copyright (C) 1998 Netscape Communications Corporation. All Rights +# Copyright (C) 1998-1999 Netscape Communications Corporation. All Rights # Reserved. diff --git a/mailnews/db/msgdb/build/makefile.win b/mailnews/db/msgdb/build/makefile.win index 0bdff23d5508..6e9277dc3d95 100644 --- a/mailnews/db/msgdb/build/makefile.win +++ b/mailnews/db/msgdb/build/makefile.win @@ -39,7 +39,6 @@ LLIBS= \ $(DIST)\lib\xpcom.lib \ $(DIST)\lib\msgbaseutil.lib \ $(DIST)\lib\msgdb_s.lib \ - $(DIST)\lib\msgmork_s.lib \ $(LIBNSPR) \ $(DIST)\lib\plc3.lib \ $(NULL) diff --git a/mailnews/db/msgdb/build/nsMsgDBCID.h b/mailnews/db/msgdb/build/nsMsgDBCID.h index b1d74bd62f19..5e4409dc278c 100644 --- a/mailnews/db/msgdb/build/nsMsgDBCID.h +++ b/mailnews/db/msgdb/build/nsMsgDBCID.h @@ -25,17 +25,17 @@ // a86c86ae-e97f-11d2-a506-0060b0fc04b7 #define NS_MAILDB_CID \ -{ 0xa86c86ae, 0xe97f, 0xa506, \ - { 0x00, 0x60, 0xb0, 0xfc, 0x04, 0xb7 } } +{ 0xa86c86ae, 0xe97f, 0x11d2, \ + { 0xa5, 0x06, 0x00, 0x60, 0xb0, 0xfc, 0x04, 0xb7 } } // 36414aa0-e980-11d2-a506-0060b0fc04b7 #define NS_NEWSDB_CID \ { 0x36414aa0, 0xe980, 0x11d2, \ - { 0x00, 0x60, 0xb0, 0xfc, 0x04, 0xb7 } } + { 0xa5, 0x06, 0x00, 0x60, 0xb0, 0xfc, 0x04, 0xb7 } } // 9e4b07ee-e980-11d2-a506-0060b0fc04b7 #define NS_IMAPDB_CID \ { 0x9e4b07ee, 0xe980, 0x11d2, \ - { 0x00, 0x60, 0xb0, 0xfc, 0x04, 0xb7 } } + { 0xa5, 0x06, 0x00, 0x60, 0xb0, 0xfc, 0x04, 0xb7 } } #endif diff --git a/mailnews/db/msgdb/src/Makefile.in b/mailnews/db/msgdb/src/Makefile.in index 4d7610c30e03..df2b1e3b845e 100644 --- a/mailnews/db/msgdb/src/Makefile.in +++ b/mailnews/db/msgdb/src/Makefile.in @@ -44,7 +44,6 @@ EXTRA_DSO_LDOPTS = \ $(NSPR_LIBS) \ -lxpcom \ -lreg \ - -lmork \ -lmsgbaseutil \ $(NULL) diff --git a/mailnews/db/msgdb/src/makefile.win b/mailnews/db/msgdb/src/makefile.win index bd799450ccf9..8c0b8a3c6779 100644 --- a/mailnews/db/msgdb/src/makefile.win +++ b/mailnews/db/msgdb/src/makefile.win @@ -12,7 +12,7 @@ # # The Initial Developer of this code under the NPL is Netscape # Communications Corporation. Portions created by Netscape are -# Copyright (C) 1998 Netscape Communications Corporation. All Rights +# Copyright (C) 1998-1999 Netscape Communications Corporation. All Rights # Reserved. DEPTH=..\..\..\.. diff --git a/mailnews/db/msgdb/src/nsMsgDatabase.cpp b/mailnews/db/msgdb/src/nsMsgDatabase.cpp index 7095b00273db..3c7c48240c44 100644 --- a/mailnews/db/msgdb/src/nsMsgDatabase.cpp +++ b/mailnews/db/msgdb/src/nsMsgDatabase.cpp @@ -28,13 +28,16 @@ #include "nsString.h" #include "nsIMsgHeaderParser.h" #include "nsMsgBaseCID.h" - +#include "nsMorkCID.h" +#include "nsIMdbFactoryFactory.h" #include "nsIMimeConverter.h" #include "nsILocale.h" #include "nsLocaleCID.h" #include "nsILocaleFactory.h" +static NS_DEFINE_CID(kCMorkFactory, NS_MORK_CID); + #if defined(XP_MAC) && defined(CompareString) #undef CompareString #endif @@ -372,17 +375,12 @@ NS_IMETHODIMP nsMsgDatabase::QueryInterface(REFNSIID aIID, void** aResult) return NS_NOINTERFACE; } -extern nsIMdbFactory *NS_NewIMdbFactory(); - /* static */ nsIMdbFactory *nsMsgDatabase::GetMDBFactory() { - static nsIMdbFactory *gMDBFactory = NULL; + static nsIMdbFactory *gMDBFactory = nsnull; if (!gMDBFactory) { - gMDBFactory = MakeMdbFactory(); //new nsIMdbFactory; -#if 0 - nsComponentManager::CreateInstance( -#endif + nsresult rv = nsComponentManager::CreateInstance(kCMorkFactory, nsnull, nsIMdbFactoryFactory::GetIID(), (void **) &gMDBFactory); } return gMDBFactory; }