diff -r 6c59112cfd31 -r 38bf5461e270 ipsservices/ipssosplugin/src/ipsplgmsgmapper.cpp
--- a/ipsservices/ipssosplugin/src/ipsplgmsgmapper.cpp Thu Sep 30 11:43:07 2010 +0300
+++ b/ipsservices/ipssosplugin/src/ipsplgmsgmapper.cpp Thu Oct 14 17:33:43 2010 +0300
@@ -307,10 +307,8 @@
TBool modified ( EFalse );
TBool unread( aEmlEntry.Unread() );
-//
- if ( LogicalXor( unread, msgFlags & EFSMsgFlag_Read ) ||
- LogicalXor( unread, msgFlags & EFSMsgFlag_Read_Locally ))
-//
+ if ( !LogicalXor( unread, msgFlags & EFSMsgFlag_Read ) ||
+ !LogicalXor( unread, msgFlags & EFSMsgFlag_Read_Locally ))
{
aEmlEntry.SetUnread( !unread );
modified = ETrue;
@@ -349,7 +347,7 @@
// EFSMsgFlag_Multiple: no counterpart in Symbian message
// EFSMsgFlag_CalendarMsg
- if( ( aEmlEntry.iMtm == KSenduiMtmSmtpUid ) && ( msgFlags & EFSMsgFlag_CalendarMsg ) )
+ if( ( aEmlEntry.iMtm == KUidMsgTypeSMTP ) && ( msgFlags & EFSMsgFlag_CalendarMsg ) )
{
if( !aEmlEntry.ICalendar() )
{
@@ -375,7 +373,7 @@
// EFSMsgFlag_Answered
// IMAP flags
- if ( aEmlEntry.iMtm == KSenduiMtmImap4Uid )
+ if ( aEmlEntry.iMtm == KUidMsgTypeIMAP4 )
{
// EFSMsgFlag_FollowUp
if ( LogicalXor( aEmlEntry.FlaggedIMAP4Flag(),
@@ -546,8 +544,8 @@
{
addr = CFSMailAddress::NewLC();
ConvertAddressL( toRecs[i], *addr );
+ CleanupStack::Pop( addr );
aMsg.AppendToRecipient( addr );
- CleanupStack::Pop( addr );
}
const CDesCArray& ccRecs = header->CcRecipients();
@@ -556,8 +554,8 @@
{
addr = CFSMailAddress::NewLC();
ConvertAddressL( ccRecs[i], *addr );
+ CleanupStack::Pop( addr );
aMsg.AppendCCRecipient( addr );
- CleanupStack::Pop( addr );
}
const CDesCArray& bccRecs = header->BccRecipients();
@@ -566,8 +564,8 @@
{
addr = CFSMailAddress::NewLC();
ConvertAddressL( bccRecs[i], *addr );
+ CleanupStack::Pop( addr );
aMsg.AppendBCCRecipient( addr );
- CleanupStack::Pop( addr );
}
CleanupStack::PopAndDestroy( header );
@@ -674,7 +672,7 @@
//
//only for incomplete POP3 messages
- if ( aEntry.iMtm.iUid == KSenduiMtmPop3UidValue &&
+ if ( aEntry.iMtm == KUidMsgTypePOP3 &&
( !aEntry.Complete() || aEntry.PartialDownloaded () ) )
{
TRAP_IGNORE( AttaCheckForIncompleteMsgL( aEntry, aMsg ) );
@@ -759,7 +757,7 @@
// but this should be tested
// Additional logic for IMAP4 messages
- if ( aEntry.iMtm == KSenduiMtmImap4Uid )
+ if ( aEntry.iMtm == KUidMsgTypeIMAP4 )
{
if ( aEntry.FlaggedIMAP4Flag() )
{
@@ -782,7 +780,7 @@
CFSMailMessagePart& aMessage )
{
FUNC_LOG;
- if ( aEntry.iMtm.iUid == KSenduiMtmPop3UidValue &&
+ if ( aEntry.iMtm == KUidMsgTypePOP3 &&
aEntry.Id() != aMsgMainId &&
!aIsAtta )
{
@@ -1222,7 +1220,7 @@
CleanupStack::PopAndDestroy( cEntry );
}
- else if ( aEntry.iMtm == KSenduiMtmPop3Uid &&
+ else if ( aEntry.iMtm == KUidMsgTypePOP3 &&
iSession.GetEntry( aEntry.Parent(), dummy, parent )
== KErrNone && parent.PartialDownloaded() )
{