diff --git a/calendar/libxpical/oeICalEventImpl.cpp b/calendar/libxpical/oeICalEventImpl.cpp index baf02eedd35..cf731ce13c3 100644 --- a/calendar/libxpical/oeICalEventImpl.cpp +++ b/calendar/libxpical/oeICalEventImpl.cpp @@ -1696,7 +1696,7 @@ bool oeICalEventImpl::ParseIcalComponent( icalcomponent *comp ) tmpstr = icalproperty_get_uid( prop ); SetId( tmpstr ); } else { - ReportError( oeIICalError::WARN, oeIICalError::UID_NOT_FOUND, "oeICalEventImpl::ParseIcalComponent() : Warning UID not found! Assigning new one." ); + ReportError( oeIICalError::CAL_WARN, oeIICalError::UID_NOT_FOUND, "oeICalEventImpl::ParseIcalComponent() : Warning UID not found! Assigning new one." ); char uidstr[40]; GenerateUUID( uidstr ); SetId( uidstr ); diff --git a/calendar/libxpical/oeICalImpl.cpp b/calendar/libxpical/oeICalImpl.cpp index 4fa57927d7e..0a5895d0014 100644 --- a/calendar/libxpical/oeICalImpl.cpp +++ b/calendar/libxpical/oeICalImpl.cpp @@ -2135,7 +2135,7 @@ oeICalImpl::GetAllTodos(nsISimpleEnumerator **resultList ) NS_IMETHODIMP oeICalImpl::ReportError( PRInt16 severity, PRUint32 errorid, const char *errorstring ) { - if( severity >= oeIICalError::PROBLEM ) { + if( severity >= oeIICalError::CAL_PROBLEM ) { #ifdef ICAL_DEBUG printf( "oeICalImpl::ReportError(%d,%x) : %s\n", severity, errorid, errorstring ); #endif diff --git a/calendar/libxpical/oeIICal.idl b/calendar/libxpical/oeIICal.idl index 2e340ad1b94..67d121d6c71 100644 --- a/calendar/libxpical/oeIICal.idl +++ b/calendar/libxpical/oeIICal.idl @@ -274,10 +274,10 @@ interface oeIICalContainer : nsISupports interface oeIICalError : nsISupports { //severity codes - const long DEBUG = 0; - const long WARN = 1; - const long PROBLEM = 2; - const long CRITICAL = 3; + const long CAL_DEBUG = 0; + const long CAL_WARN = 1; + const long CAL_PROBLEM = 2; + const long CAL_CRITICAL = 3; //error codes const long UID_NOT_FOUND = 1001;