diff -r e5b3a2155e1a -r d2c4c66342f3 messagingfw/msgsrvnstore/server/src/msvdbadapter.cpp --- a/messagingfw/msgsrvnstore/server/src/msvdbadapter.cpp Thu Aug 19 10:24:00 2010 +0300 +++ b/messagingfw/msgsrvnstore/server/src/msvdbadapter.cpp Tue Aug 31 15:41:11 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-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" @@ -1251,7 +1251,7 @@ KUidMsvFolderEntryValue == aEntry->Entry().iType.iUid ) { - CMsvEntryFreePool::Instance()->ReleaseEntry(aEntry); + CMsvEntryFreePool::Instance()->ReleaseEntryL(aEntry); User::Leave(KErrNotFound); } @@ -1377,7 +1377,6 @@ aChildArray.AppendL(cacheEntry); CleanupStack::Pop(cacheEntry); } - CleanupStack::PopAndDestroy(2); //getStmt, queryBuf } @@ -4309,7 +4308,7 @@ while(KSqlAtRow == Idquerystatement.Next()) { - aIdArray.Append(ColumnInt(Idquerystatement, Idindex)); + aIdArray.AppendL(ColumnInt(Idquerystatement, Idindex)); } CleanupStack::PopAndDestroy(2); //buf,Idquerystatement @@ -4359,12 +4358,12 @@ type == KUidMsvEmailRtfEntryValue ) { - aIdArray.Append(childId); + aIdArray.AppendL(childId); } // Recursion for alternate folders else if(type == KUidMsvFolderEntryValue) { - aIdArray.Append(childId); + aIdArray.AppendL(childId); // also get the childs for these messages GetAllMimeIdsL(childId, aIdArray); }