From 26a48f4560acda2b3b7e9c828be7f42dcd5d46a2 Mon Sep 17 00:00:00 2001 From: "mostafah%oeone.com" Date: Mon, 24 Nov 2003 20:08:38 +0000 Subject: [PATCH] CID files should not be included from other projects git-svn-id: svn://10.0.0.236/trunk@149690 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/calendar/libxpical/oeICalEventImpl.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mozilla/calendar/libxpical/oeICalEventImpl.cpp b/mozilla/calendar/libxpical/oeICalEventImpl.cpp index b167c14a6d7..10ed1f120bf 100644 --- a/mozilla/calendar/libxpical/oeICalEventImpl.cpp +++ b/mozilla/calendar/libxpical/oeICalEventImpl.cpp @@ -47,8 +47,7 @@ which is an event with display information added to it is included here as well. #include "nsMemory.h" #include "nsCOMPtr.h" #include "plbase64.h" -#include "nsMsgCompCID.h" -#include "nsAbBaseCID.h" +#include "nsComponentManagerUtils.h" #include "nsIAbCard.h" #include "nsIMsgAttachment.h" @@ -2239,7 +2238,7 @@ bool oeICalEventImpl::ParseIcalComponent( icalcomponent *comp ) if( strcmp( tmpstr, "Attachment" ) == 0 ) { nsresult rv; tmpstr = (char *)icalproperty_get_value_as_string( prop ); - nsCOMPtr attachment = do_CreateInstance(NS_MSGATTACHMENT_CONTRACTID, &rv); + nsCOMPtr attachment = do_CreateInstance( "@mozilla.org/messengercompose/attachment;1", &rv); if ( NS_SUCCEEDED(rv) && attachment ) { attachment->SetUrl( tmpstr ); AddAttachment( attachment ); @@ -2254,7 +2253,7 @@ bool oeICalEventImpl::ParseIcalComponent( icalcomponent *comp ) prop = icalcomponent_get_next_property( vevent, ICAL_CONTACT_PROPERTY ) ) { tmpstr = icalproperty_get_contact( prop ); nsresult rv; - nsCOMPtr contact = do_CreateInstance(NS_ABCARDPROPERTY_CONTRACTID, &rv); + nsCOMPtr contact = do_CreateInstance( "@mozilla.org/addressbook/cardproperty;1", &rv); if ( NS_SUCCEEDED(rv) && contact ) { nsAutoString email; email.AssignWithConversion( tmpstr );