diff -r 38571fd2a704 -r 0f07cd1b5772 calendarui/multicaluidialog/src/multicaluidialogmodel.cpp --- a/calendarui/multicaluidialog/src/multicaluidialogmodel.cpp Fri Mar 12 15:42:35 2010 +0200 +++ b/calendarui/multicaluidialog/src/multicaluidialogmodel.cpp Mon Mar 15 12:40:18 2010 +0200 @@ -26,6 +26,8 @@ #include "multicaluidialogmodel.h" #include "calendarui_debug.h" +_LIT( KCalendarDatabaseFilePath, "c:calendar" ); + // ---------------------------------------------------------------------------- // CMultiCalUiDialogModel::CMultiCalUiDialogModel // Constructor @@ -148,7 +150,7 @@ { iCalendarStatus.Append(0); - if (!index) //First create the default session + /* if (!index) //First create the default session { const TPtrC name = iCalendarInfoList[index]->FileNameL(); defaultSession->OpenL(name); @@ -158,7 +160,7 @@ iCalEntryViewArray.Append(entryView); CleanupStack::Pop(entryView); } - else + else*/ { CCalSession* session = CCalSession::NewL(*defaultSession); CleanupStack::PushL(session); @@ -234,19 +236,19 @@ TRACE_ENTRY_POINT //Create copy for entires. RPointerArray copyEntries; - CreateCopyL(copyEntries); - //Store the copy into calendars for (TInt i = 0; i < iCalEntryViewArray.Count(); i++) { if (iCalendarStatus[i]) { - TInt numSuccess; + TInt numSuccess; + CreateCopyL(copyEntries); iCalEntryViewArray[i]->StoreL(copyEntries, numSuccess); + copyEntries.ResetAndDestroy(); } } - copyEntries.ResetAndDestroy(); + TRACE_EXIT_POINT; } @@ -305,7 +307,15 @@ CCalCalendarInfo* calendarInfo = calIter->FirstL(); while (calendarInfo) { - aCalendarInfoList.AppendL(calendarInfo); + TPtrC fileNamePtr = calendarInfo->FileNameL(); + if(fileNamePtr.CompareF(KCalendarDatabaseFilePath)) + { + aCalendarInfoList.AppendL(calendarInfo); + } + else + { + delete calendarInfo; + } calendarInfo = calIter->NextL(); } CleanupStack::PopAndDestroy(calIter);