diff -r 55d60436f00b -r d68a4b5d5885 calendarui/globaldata/src/calenglobaldata.cpp --- a/calendarui/globaldata/src/calenglobaldata.cpp Tue May 11 16:12:24 2010 +0300 +++ b/calendarui/globaldata/src/calenglobaldata.cpp Tue May 25 12:41:10 2010 +0300 @@ -58,8 +58,7 @@ _LIT(KPersonal,"Personal"); -_LIT(KFamily,"Family"); -_LIT(KFriends,"Friends"); + _LIT( KMissedAlarmResourceFile, "z:\\resource\\CalenSvrMissedAlarmManagerResource.rsc"); // changes done // ============================ MEMBER FUNCTIONS =============================== @@ -1524,24 +1523,7 @@ iCalendarInfoList[index]->SetNameL(*personalCalendar); CleanupStack::PopAndDestroy( personalBuffer ); } - else if(calendarNamePtr.Compare(KFamily) == 0) - { - HBufC8* familyBuffer=resourceFile.AllocReadLC( R_CALE_DB_FAMILY ); - const TPtrC16 ptrFBuffer(( TText16*) familyBuffer->Ptr(), - ( familyBuffer->Length()+1 )>>1 ); - HBufC *familyCalendar = ptrFBuffer.AllocL(); - iCalendarInfoList[index]->SetNameL(*familyCalendar); - CleanupStack::PopAndDestroy( familyBuffer ); - } - else if(calendarNamePtr.Compare(KFriends) == 0) - { - HBufC8* friendsBuffer = resourceFile.AllocReadLC( R_CALE_DB_FRIENDS ); - const TPtrC16 ptrFrBuffer(( TText16*) friendsBuffer->Ptr(), - ( friendsBuffer->Length()+1 )>>1 ); - HBufC *friendsCalendar = ptrFrBuffer.AllocL(); - iCalendarInfoList[index]->SetNameL(*friendsCalendar); - CleanupStack::PopAndDestroy( friendsBuffer ); - } + aCalendarInfoList.AppendL(iCalendarInfoList[index]);