# HG changeset patch # User hgs # Date 1282072572 -19800 # Node ID 5b3b2fa8c3eca2b9d0fe3aa8dac9e0df51a55bbd # Parent 3507212d340e7657a1eb0d535ef9df6c0be290a3 201033_01 diff -r 3507212d340e -r 5b3b2fa8c3ec email/imap4mtm/imapsession/src/cimapsessionmanager.cpp --- a/email/imap4mtm/imapsession/src/cimapsessionmanager.cpp Fri Aug 06 23:19:50 2010 +0530 +++ b/email/imap4mtm/imapsession/src/cimapsessionmanager.cpp Wed Aug 18 00:46:12 2010 +0530 @@ -141,7 +141,11 @@ { __LOG_TEXT(aSessionList[session]->LogId(), "CImapSessionManager::Disconnect (async, list)"); - iDisconnectList.Append(aSessionList[session]); + TInt err = iDisconnectList.Append(aSessionList[session]); + if(err != KErrNone) + { + break; + } } iProgressState = TImap4GenericProgress::EDisconnecting; @@ -167,7 +171,11 @@ { __LOG_TEXT(aSessionList[session]->LogId(), "CImapSessionManager::Disconnect (sync, list)"); - iDisconnectList.Append(aSessionList[session]); + TInt err = iDisconnectList.Append(aSessionList[session]); + if(KErrNone != err) + { + CloseSessionStreams(aSessionList[session]); + } } ImmediateDisconnect(); @@ -187,9 +195,20 @@ // Create a disconnect list with just this one session iDisconnectList.Reset(); - iDisconnectList.Append(&aSession); + TInt err = iDisconnectList.Append(&aSession); + + if(KErrNone != err) + { + // remove contness of aSession + CImapSession& session = const_cast(aSession); + MOutputStream* outputStream = session.OutputStream(); + if (outputStream != NULL) + { + outputStream->Close(); + } + } + ImmediateDisconnect(); - __LOG_TEXT(aSession.LogId(), "CImapSessionManager::Disconnect() - END - (sync, session)"); } diff -r 3507212d340e -r 5b3b2fa8c3ec email/imap4mtm/imapsyncmanager/src/cimapfolder.cpp --- a/email/imap4mtm/imapsyncmanager/src/cimapfolder.cpp Fri Aug 06 23:19:50 2010 +0530 +++ b/email/imap4mtm/imapsyncmanager/src/cimapfolder.cpp Wed Aug 18 00:46:12 2010 +0530 @@ -249,7 +249,7 @@ for(TInt localloop = 0; localloop < localcount; ++localloop) { TMsvId localid = (*iFolderIndex)[localloop].iUid; - iMatchingMessageIds.Append(localid); + iMatchingMessageIds.AppendL(localid); } iMessageFlagInfoArray.Reset(); @@ -756,7 +756,7 @@ { // Saved the index position of the message to be deleted from the local view __LOG_FORMAT((iSavedSession->LogId(), "ImapFolder: Local message (%d) marked for deleting, loop = %d", (*iFolderIndex)[localloop].iMsvId, localloop)); - iDeletedMessageIds.Append(localloop); + iDeletedMessageIds.AppendL(localloop); } else { @@ -789,7 +789,7 @@ if(iFolderIndex->FindMsg(remoteUid) == 0) { - iMissingMessageIds.Append(remoteUid); + iMissingMessageIds.AppendL(remoteUid); } } } @@ -1748,9 +1748,9 @@ // Append to the delete list TInt64 uid=(TUint)((TMsvEmailEntry)iServerEntry.Entry()).UID(); - deletingMessageIds.Append(uid); + deletingMessageIds.AppendL(uid); // index of local message in iFolderIndex to be deleted - iDeletedMessageIds.Append(pos); + iDeletedMessageIds.AppendL(pos); ++deleted; } diff -r 3507212d340e -r 5b3b2fa8c3ec email/pop3andsmtpmtm/clientmtms/src/CIMPLAINBODYTEXT.cpp --- a/email/pop3andsmtpmtm/clientmtms/src/CIMPLAINBODYTEXT.cpp Fri Aug 06 23:19:50 2010 +0530 +++ b/email/pop3andsmtpmtm/clientmtms/src/CIMPLAINBODYTEXT.cpp Wed Aug 18 00:46:12 2010 +0530 @@ -70,7 +70,7 @@ TInt count = iEmailMessage.Selection().Count(); for(TInt i=0;iInitialisePlainBodyTextForWriteL(EFalse, charset, defaultCharset)); + iPlainTextArray.AppendL(iStore->InitialisePlainBodyTextForWriteL(EFalse, charset, defaultCharset)); } else { @@ -105,7 +105,7 @@ CMsvStore* store = iMsvEntry.ReadStoreL(); CleanupStack::PushL(store); - iPlainTextArray.Append( store->InitialisePlainBodyTextForReadL(aChunkLength)); + iPlainTextArray.AppendL( store->InitialisePlainBodyTextForReadL(aChunkLength)); // if the existing charset was overidden by calling CImEmailMessage::SetCharacterSetL if(override) { diff -r 3507212d340e -r 5b3b2fa8c3ec email/pop3andsmtpmtm/clientmtms/src/MIUTHDR.CPP --- a/email/pop3andsmtpmtm/clientmtms/src/MIUTHDR.CPP Fri Aug 06 23:19:50 2010 +0530 +++ b/email/pop3andsmtpmtm/clientmtms/src/MIUTHDR.CPP Wed Aug 18 00:46:12 2010 +0530 @@ -2865,7 +2865,7 @@ { TPtrC16 str2 = str1.Left(startPos); TInt a= ConvertToTInt(str2); - encodingData.Append(a); + encodingData.AppendL(a); startPos++; str1.Set(str1.Mid(startPos, str1.Length()- startPos)); diff -r 3507212d340e -r 5b3b2fa8c3ec email/pop3andsmtpmtm/clientmtms/src/MIUTMSG.CPP --- a/email/pop3andsmtpmtm/clientmtms/src/MIUTMSG.CPP Fri Aug 06 23:19:50 2010 +0530 +++ b/email/pop3andsmtpmtm/clientmtms/src/MIUTMSG.CPP Wed Aug 18 00:46:12 2010 +0530 @@ -6449,7 +6449,7 @@ // def070915 - propagated fix attachment->SetId(iHtmlId); CleanupStack::Pop(attachment); - iAttachmentInfoList.Append(attachment); + iAttachmentInfoList.AppendL(attachment); ++iTotalAttachments; iPartList=iPartList|KMsvMessagePartAttachments; } diff -r 3507212d340e -r 5b3b2fa8c3ec messagingappbase/smilparser/Rom/Gmxml.iby --- a/messagingappbase/smilparser/Rom/Gmxml.iby Fri Aug 06 23:19:50 2010 +0530 +++ b/messagingappbase/smilparser/Rom/Gmxml.iby Wed Aug 18 00:46:12 2010 +0530 @@ -19,7 +19,7 @@ #define __GMXML_IBY__ #include -file=ABI_DIR\BUILD_DIR\SMILDTD.dll System\libs\SMILDTD.dll +file=ABI_DIR\BUILD_DIR\smildtd.dll System\libs\smildtd.dll #endif diff -r 3507212d340e -r 5b3b2fa8c3ec mmsengine/mmssettings/src/cmmssettings.cpp --- a/mmsengine/mmssettings/src/cmmssettings.cpp Fri Aug 06 23:19:50 2010 +0530 +++ b/mmsengine/mmssettings/src/cmmssettings.cpp Wed Aug 18 00:46:12 2010 +0530 @@ -687,6 +687,7 @@ iApplicationId = aMmsSettings.iApplicationId; delete iAddress; + iAddress = NULL; iAddress = aMmsSettings.Address().AllocL(); iCreationMode = aMmsSettings.iCreationMode; @@ -695,14 +696,14 @@ iProxy.Reset(); for(TInt loop=0; loop < count; ++loop) { - iProxy.Append(aMmsSettings.GetProxy(loop)); + iProxy.AppendL(aMmsSettings.GetProxy(loop)); } count = aMmsSettings.NapIdCount(); iNapId.Reset(); for(TInt loop=0; loop < count; ++loop) { - iNapId.Append(aMmsSettings.GetNapId(loop)); + iNapId.AppendL(aMmsSettings.GetNapId(loop)); } iAutomaticDownloadOptions = aMmsSettings.iAutomaticDownloadOptions; diff -r 3507212d340e -r 5b3b2fa8c3ec mobilemessaging/smsmtm/clientmtm/src/SMUTHDR.CPP --- a/mobilemessaging/smsmtm/clientmtm/src/SMUTHDR.CPP Fri Aug 06 23:19:50 2010 +0530 +++ b/mobilemessaging/smsmtm/clientmtm/src/SMUTHDR.CPP Wed Aug 18 00:46:12 2010 +0530 @@ -1005,7 +1005,7 @@ while(startPos != KErrNotFound ) { TPtrC16 str2 = str1.Left(startPos); - smsNumberData.Append(str2); + smsNumberData.AppendL(str2); startPos++; str1.Set(str1.Mid(startPos, str1.Length()- startPos)); diff -r 3507212d340e -r 5b3b2fa8c3ec mobilemessaging/smsmtm/conf/smsmtm_1000102c.crml Binary file mobilemessaging/smsmtm/conf/smsmtm_1000102c.crml has changed diff -r 3507212d340e -r 5b3b2fa8c3ec mobilemessaging/smsmtm/servermtm/src/SMSSOUTB.CPP --- a/mobilemessaging/smsmtm/servermtm/src/SMSSOUTB.CPP Fri Aug 06 23:19:50 2010 +0530 +++ b/mobilemessaging/smsmtm/servermtm/src/SMSSOUTB.CPP Wed Aug 18 00:46:12 2010 +0530 @@ -588,6 +588,7 @@ iEntry.SetConnected(EFalse); iEntry.SetFailed(EFalse); iEntry.SetSendingState(KMsvSendStateSent); + iEntry.iDate.UniversalTime(); //Only update the message if it has changed if (!(iEntry == iServerEntry.Entry())) diff -r 3507212d340e -r 5b3b2fa8c3ec mobilemessaging/smsmtm/servermtm/src/SMSSSEND.CPP --- a/mobilemessaging/smsmtm/servermtm/src/SMSSSEND.CPP Fri Aug 06 23:19:50 2010 +0530 +++ b/mobilemessaging/smsmtm/servermtm/src/SMSSSEND.CPP Wed Aug 18 00:46:12 2010 +0530 @@ -1,4 +1,4 @@ -// Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2000-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -152,7 +152,8 @@ iEntry.SetFailed(EFalse); iEntry.SetSendingState(KMsvSendStateSending); iEntry.iError = KErrNone; - + iEntry.iDate.UniversalTime(); + ChangeEntryL(iEntry); } diff -r 3507212d340e -r 5b3b2fa8c3ec mobilemessaging/smsmtm/servermtm/src/SMSSendSession.cpp --- a/mobilemessaging/smsmtm/servermtm/src/SMSSendSession.cpp Fri Aug 06 23:19:50 2010 +0530 +++ b/mobilemessaging/smsmtm/servermtm/src/SMSSendSession.cpp Wed Aug 18 00:46:12 2010 +0530 @@ -1,4 +1,4 @@ -// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -129,6 +129,7 @@ entry.SetSendingState(KMsvSendStateFailed); entry.iError = KErrUnknownBioType; divideError = KErrUnknownBioType; + entry.iDate.UniversalTime(); iServerEntry.ChangeEntry(entry); //ignore error? aSelection.Delete(selCount);