Build should go green now.

xpfc/core/inc/nsxpfcFactory.h

@@ -54,10 +54,12 @@
 #include "nsXPFCObserverManager.h"
 #include "nsSMTPService.h"
 #include "nsMIMEService.h"
+#if 0
 #include "nsMessage.h"
 #include "nsMIMEMessage.h"
 #include "nsMIMEBodyPart.h"
 #include "nsMIMEBasicBodyPart.h"
+#endif
 #include "nsXPFCSubject.h"
 #include "nsXPFCCommand.h"
 #include "nsXPFCCanvas.h"
@@ -117,10 +119,12 @@ static NS_DEFINE_IID(kCXPFCActionCommand,         NS_XPFC_ACTION_COMMAND_CID);
 static NS_DEFINE_IID(kCUserCID,                   NS_USER_CID);
 static NS_DEFINE_IID(kCSMTPServiceCID,            NS_SMTP_SERVICE_CID);
 static NS_DEFINE_IID(kCMessageCID,                NS_MESSAGE_CID);
+#if 0
 static NS_DEFINE_IID(kCMIMEMessageCID,            NS_MIME_MESSAGE_CID);
 static NS_DEFINE_IID(kCMIMEServiceCID,            NS_MIME_SERVICE_CID);
 static NS_DEFINE_IID(kCMIMEBodyPartCID,           NS_MIME_BODY_PART_CID);
 static NS_DEFINE_IID(kCMIMEBasicBodyPartCID,      NS_MIME_BASIC_BODY_PART_CID);
+#endif
 
 class nsxpfcFactory : public nsIFactory
 {   

xpfc/core/src/manifest.mn

@@ -21,5 +21,5 @@ CPPSRCS = \
 	nsxpfcFactory.cpp \
 	$(NULL)
 
-REQUIRES = shell xpcom raptor netlib
+REQUIRES = shell xpcom raptor netlib util img
 

xpfc/core/src/nsxpfcFactory.cpp

@@ -160,7 +160,9 @@ nsresult nsxpfcFactory::CreateInstance(nsISupports *aOuter,
     inst = (nsISupports *)new nsXPFCDataCollectionManager();
   } else if (mClassID.Equals(kCSMTPServiceCID)) {
     inst = (nsISupports *)new nsSMTPService();
-  } else if (mClassID.Equals(kCMIMEServiceCID)) {
+  }
+#if 0
+  else if (mClassID.Equals(kCMIMEServiceCID)) {
     inst = (nsISupports *)new nsMIMEService();
   } else if (mClassID.Equals(kCMessageCID)) {
     inst = (nsISupports *)new nsMessage();
@@ -171,6 +173,7 @@ nsresult nsxpfcFactory::CreateInstance(nsISupports *aOuter,
   } else if (mClassID.Equals(kCMIMEBasicBodyPartCID)) {
     inst = (nsISupports *)(nsIMIMEBodyPart*) new nsMIMEBasicBodyPart();
   }
+#endif
 
   if (inst == NULL) {  
     return NS_ERROR_OUT_OF_MEMORY;