--- a/calendarui/application/group/Calendar.mmp	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/application/group/Calendar.mmp	Fri Mar 12 15:42:35 2010 +0200
@@ -91,8 +91,7 @@
 //   NetworkServices // For sending vCalendars?
 //   ProtServ // For connecting Agenda Server? 
 //   DRM // Calendar alarm tones are DRM protected 
-CAPABILITY      CAP_APPLICATION \
-                NetworkControl AllFiles
+CAPABILITY      CAP_APPLICATION
 
 VENDORID        VID_DEFAULT
 

--- a/calendarui/application/group/iconlist.txt	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/application/group/iconlist.txt	Fri Mar 12 15:42:35 2010 +0200
@@ -29,4 +29,6 @@
 -c8,8  qgn_indi_cdr_todo_undone_missed_new
 -c8,8  qgn_indi_tb_cale_alarm_dismiss
 -c8,8  qgn_indi_tb_cale_alarm_dismiss_all
--c8,8  qgn_stat_sync.svg
\ No newline at end of file
+-c8,8  qgn_stat_sync.svg
+-c8,8  qgn_indi_cale_tb_today.svg
+-c8,8  qgn_indi_cale_tb_changeview.svg

--- a/calendarui/commonutils/bwins/calencommonutilsu.def	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/commonutils/bwins/calencommonutilsu.def	Fri Mar 12 15:42:35 2010 +0200
@@ -29,7 +29,7 @@
 	?SizeString@CCalenAttachmentInfo@@QBEPAVHBufC16@@XZ @ 28 NONAME ; class HBufC16 * CCalenAttachmentInfo::SizeString(void) const
 	?RemoveEntriesEndingAtMidnightL@CalenAgendaUtils@@SAXAAV?$RPointerArray@VCCalInstance@@@@ABVTTime@@@Z @ 29 NONAME ; void CalenAgendaUtils::RemoveEntriesEndingAtMidnightL(class RPointerArray<class CCalInstance> &, class TTime const &)
 	?Status@CCalenEntryUtil@@QBEABW4TStatus@CCalEntry@@XZ @ 30 NONAME ; enum CCalEntry::TStatus const & CCalenEntryUtil::Status(void) const
-	?AddAttachmentL@CCalenAttachmentModel@@QAEXABVTDesC16@@0HHABVTDataType@@@Z @ 31 NONAME ; void CCalenAttachmentModel::AddAttachmentL(class TDesC16 const &, class TDesC16 const &, int, int, class TDataType const &)
+	?AddAttachmentL@CCalenAttachmentModel@@QAEXABVTDesC16@@0HHABVTDataType@@AAVRFile@@@Z @ 31 NONAME ; void CCalenAttachmentModel::AddAttachmentL(class TDesC16 const &, class TDesC16 const &, int, int, class TDataType const &, class RFile &)
 	?OnSameDay@CalenDateUtils@@SAHABVTTime@@0@Z @ 32 NONAME ; int CalenDateUtils::OnSameDay(class TTime const &, class TTime const &)
 	?OpenAttachmentL@CCalenAttachmentUtils@@SAXAAVRFile@@AAVMAknServerAppExitObserver@@@Z @ 33 NONAME ; void CCalenAttachmentUtils::OpenAttachmentL(class RFile &, class MAknServerAppExitObserver &)
 	?LoadResourcesL@CCalenAttachmentModel@@QAEXXZ @ 34 NONAME ; void CCalenAttachmentModel::LoadResourcesL(void)

--- a/calendarui/commonutils/eabi/calencommonutilsu.def	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/commonutils/eabi/calencommonutilsu.def	Fri Mar 12 15:42:35 2010 +0200
@@ -84,7 +84,7 @@
 	_ZN20CCalenAttachmentInfo4NewLER21CCalenAttachmentModelRK4TBufILi256EES5_iiRK9TDataTypeNS_25TCalenAttachmentStoreTypeE @ 83 NONAME
 	_ZN21CCalenAttachmentModel11SetObserverEP29MCalenAttachmentModelObserver @ 84 NONAME
 	_ZN21CCalenAttachmentModel14AddAttachmentLERK7TDesC16S2_ @ 85 NONAME
-	_ZN21CCalenAttachmentModel14AddAttachmentLERK7TDesC16S2_iiRK9TDataType @ 86 NONAME
+	_ZN21CCalenAttachmentModel14AddAttachmentLERK7TDesC16S2_iiRK9TDataTypeR5RFile @ 86 NONAME
 	_ZN21CCalenAttachmentModel14BitmapForFileLER20CCalenAttachmentInfo @ 87 NONAME
 	_ZN21CCalenAttachmentModel14LoadResourcesLEv @ 88 NONAME
 	_ZN21CCalenAttachmentModel16DeleteAttachmentEi @ 89 NONAME

--- a/calendarui/commonutils/group/commonutils.mmp	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/commonutils/group/commonutils.mmp	Fri Mar 12 15:42:35 2010 +0200
@@ -99,8 +99,7 @@
 LIBRARY		aknlayout2scalable.lib
 LIBRARY		gdi.lib
 
-CAPABILITY      CAP_GENERAL_DLL \
-                DRM
+CAPABILITY      CAP_GENERAL_DLL
 
 VENDORID        VID_DEFAULT
 

--- a/calendarui/commonutils/inc/calenattachmentinfo.h	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/commonutils/inc/calenattachmentinfo.h	Fri Mar 12 15:42:35 2010 +0200
@@ -167,7 +167,29 @@
          * Performs icon updating.
          */
         void DoUpdateIconL();
-    
+        
+        /**
+         * Sets the file handle.
+         * @param aFile File handle to be set
+         * 
+         */
+        void SetFileHandle(RFile& aFile);
+        
+        /**
+         * Gets the file handle.
+         * @param File handle.
+         * 
+         */
+        void FileHandle( RFile& aFile );
+        
+        /**
+         * Check whether the file handle is set or not.
+         * @return The isSetFileHandle
+         * 
+         */
+        TBool IsFileHandleSet();
+        
+
     private:
         
         CCalenAttachmentModel& iAttachmentModel;
@@ -178,6 +200,8 @@
         CGulIcon* iIcon;
         TBool iIsFetched;
         TCalenAttachmentStoreType iAttachmentStoreType;
+		RFile iFile;
+        TBool isSetFileHandle;
     };
 
 #endif // CALENATTACHMENTINFO_H

--- a/calendarui/commonutils/inc/calenattachmentmodel.h	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/commonutils/inc/calenattachmentmodel.h	Fri Mar 12 15:42:35 2010 +0200
@@ -133,7 +133,7 @@
          * @param aDataType mime type of the attachment
          */
         IMPORT_C void AddAttachmentL( const TDesC& aFullName, const TDesC& aSystemFileName, TInt aSize,
-                   TBool aFetched, const TDataType& aDataType );
+                   TBool aFetched, const TDataType& aDataType, RFile &aFile);
         
         /**
          * Deletes attachment from internal array. Notifies attachment model

--- a/calendarui/commonutils/src/calenattachmentinfo.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/commonutils/src/calenattachmentinfo.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -67,6 +67,10 @@
     TRACE_ENTRY_POINT;
     TRACE_EXIT_POINT;
     delete iIcon;
+    if(isSetFileHandle)
+        {
+        iFile.Close();
+        }
     }
 
 // ----------------------------------------------------------------------------
@@ -292,6 +296,46 @@
     return iSystemFileName;
     }
 
+// ----------------------------------------------------------------------------
+// CCalenAttachmentInfo::SetFileHandle
+//
+//Sets the file handle
+// ----------------------------------------------------------------------------
+//
+void CCalenAttachmentInfo::SetFileHandle(RFile& aFile)
+    {
+    TRACE_ENTRY_POINT;
+    iFile.Duplicate(aFile);
+    isSetFileHandle = ETrue;
+    TRACE_EXIT_POINT;
+    }
+
+// ----------------------------------------------------------------------------
+// CCalenAttachmentInfo::FileHandle
+//
+//Gets the file handle.
+// ----------------------------------------------------------------------------
+//
+void CCalenAttachmentInfo::FileHandle( RFile& aFile )
+    {
+    TRACE_ENTRY_POINT;
+
+    aFile.Duplicate( iFile );
+    TRACE_EXIT_POINT;
+    }
+
+// ----------------------------------------------------------------------------
+// CCalenAttachmentInfo::IsFileHandleSet
+// ----------------------------------------------------------------------------
+//
+TBool CCalenAttachmentInfo::IsFileHandleSet()
+    {
+    TRACE_ENTRY_POINT;
+    TRACE_EXIT_POINT;
+    
+    return isSetFileHandle;
+    }
+
 //end of file
 
 

--- a/calendarui/commonutils/src/calenattachmentmodel.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/commonutils/src/calenattachmentmodel.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -281,7 +281,8 @@
                                                     const TDesC& aSystemFileName,
                                                     TInt aSize,
                                                     TBool aFetched,
-                                                    const TDataType& aDataType )
+                                                    const TDataType& aDataType,
+                                                    RFile& aFile)
 	{
 	
 	TRACE_ENTRY_POINT;
@@ -294,6 +295,7 @@
 	                aDataType, 
 	                CCalenAttachmentInfo::ECalenAttachmentFetchedFromEntry );
 	CleanupStack::PushL(info);
+	info->SetFileHandle( aFile );
 	iAttachInfoArray.AppendL(info);
 	CleanupStack::Pop();
 	isAttachmentModelCleared = EFalse;
@@ -341,13 +343,16 @@
 		// Get the attachment file name
 		TFileName fileName( attachmentInfo->FileName() );
 		
+		TParsePtrC fileNameParser(fileName);
+		TPtrC parsedFileName = fileNameParser.NameAndExt();
+		
 		// Confirm if needs to be deleted.
 		CAknQueryDialog* confirmQuery = NULL;
 		confirmQuery = CAknQueryDialog::NewL();
 		HBufC* stringBuf = NULL;
 		stringBuf = StringLoader::LoadLC( 
 		                                  R_QTN_QUERY_COMMON_CONF_REMOVE, 
-		                                  fileName,
+		                                  parsedFileName,
 		                                  CEikonEnv::Static() );
 		confirmQuery->SetPromptL( *stringBuf );
 		if( EAknSoftkeyYes != 
@@ -482,17 +487,24 @@
     
     RFile file;
     CCalenAttachmentInfo* attachmentInfo = iAttachInfoArray[aIndex];
-    TParsePtrC fileNameParser(attachmentInfo->SystemFileName());
-    CEikonEnv* eikonEnv = CEikonEnv::Static();
-    RFs& fs = eikonEnv->FsSession();
-    User::LeaveIfError(fs.ShareProtected());
-    TInt err = file.Open( fs, attachmentInfo->SystemFileName(), 
-                          EFileRead|EFileShareReadersOnly);
-    if(err == KErrInUse)
+    if( attachmentInfo->IsFileHandleSet() )
+        {
+		attachmentInfo->FileHandle(file);
+        }
+    else
         {
-        file.Close();
-        User::LeaveIfError( file.Open( fs, attachmentInfo->SystemFileName(),
-                            EFileRead|EFileShareReadersOnly) );
+        TParsePtrC fileNameParser(attachmentInfo->SystemFileName());
+        CEikonEnv* eikonEnv = CEikonEnv::Static();
+        RFs& fs = eikonEnv->FsSession();
+        User::LeaveIfError(fs.ShareProtected());
+        TInt err = file.Open( fs, attachmentInfo->SystemFileName(), 
+                              EFileRead|EFileShareReadersOnly);
+        if(err == KErrInUse)
+            {
+            file.Close();
+            User::LeaveIfError( file.Open( fs, attachmentInfo->SystemFileName(),
+                                EFileRead|EFileShareReadersOnly) );
+            }    
         }
     
     TRACE_EXIT_POINT;
@@ -593,7 +605,7 @@
 					fileHandle.Size(fileSize);
 
 					AddAttachmentL( fileName, systemFileName, fileSize,
-					                ETrue, fileMimeType );
+					                ETrue, fileMimeType, fileHandle);
 					CleanupStack::PopAndDestroy(&fileHandle);
 					}
 				}

--- a/calendarui/commonutils/src/calenattachmentutils.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/commonutils/src/calenattachmentutils.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -50,7 +50,7 @@
 const TInt KCalenTextFileNameLength = 20;
 
 _LIT( KTextFilenameExtension, ".txt" );
-_LIT( KCalenUnifiedEditorTempDir, "c:\\data\\caleneditor\\" );
+_LIT( KCalenUnifiedEditorTempDir, "c:\\private\\10005901\\caleneditor\\" );
 _LIT8( KNotePadTextDataType, "text/plain" );
 
 // -----------------------------------------------------------------------------

--- a/calendarui/commonutils/src/calenentryutil.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/commonutils/src/calenentryutil.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -1010,10 +1010,12 @@
     TRACE_ENTRY_POINT;
 
     TBool allDayEvent(EFalse);
+    
+    TTimeIntervalDays differenceInTime = aStopTime.DaysFrom(aStartTime); // fix for AllDayEntry issue
 
     if( aStartTime == CalenDateUtils::BeginningOfDay( aStartTime ) 
             && aStopTime == CalenDateUtils::BeginningOfDay( aStopTime ) 
-            && aStartTime != aStopTime )
+            && aStartTime != aStopTime && differenceInTime.Int() == 1) // fix for AllDayEntry issue
         {
         allDayEvent = ETrue;
         }

--- a/calendarui/commonutils/src/calenviewutils.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/commonutils/src/calenviewutils.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -202,10 +202,11 @@
     
         TTime startLocalTime = startTime.TimeLocalL();
         TTime stopLocalTime = stopTime.TimeLocalL();
+        TTimeIntervalDays differenceInTime = stopLocalTime.DaysFrom(startLocalTime); // fix for AllDayEntry issue
         if( startLocalTime != stopLocalTime && 
                 startLocalTime == CalenDateUtils::BeginningOfDay( startLocalTime ) && 
                 stopLocalTime == CalenDateUtils::BeginningOfDay( stopLocalTime ) && 
-                startLocalTime != stopLocalTime )
+                startLocalTime != stopLocalTime && differenceInTime.Int() == 1 ) // fix for AllDayEntry issue
             {
             allDayEvent = ETrue;
             }

--- a/calendarui/controller/data/calencommonui.rss	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/controller/data/calencommonui.rss	Fri Mar 12 15:42:35 2010 +0200
@@ -467,8 +467,8 @@
                         {
                         helptxt = qtn_cale_tb_today_tooltip;
                         bmpfile = BITMAP_DIR"\\calendar.mif";
-                        bmpid = EMbmCalendarQgn_indi_repeat_add;
-                        bmpmask = EMbmCalendarQgn_indi_repeat_add_mask;
+                        bmpid = EMbmCalendarQgn_indi_cale_tb_today;
+                        bmpmask = EMbmCalendarQgn_indi_cale_tb_today_mask;
                         extension = r_calen_tb_ext_qgn_indi_cale_tb_repeat_add;
                         }
                     };
@@ -482,8 +482,8 @@
                 {
                 helptxt = qtn_cale_tb_change_view_tooltip;
                 bmpFile = BITMAP_DIR"\\calendar.mif";
-                bmpId = EMbmCalendarQgn_indi_cale_tb_right;
-                bmpMask = EMbmCalendarQgn_indi_cale_tb_right_mask ;
+                bmpId = EMbmCalendarQgn_indi_cale_tb_changeview;
+                bmpMask = EMbmCalendarQgn_indi_cale_tb_changeview_mask ;
                 extension = r_calen_tb_ext_qgn_indi_cale_tb_right;
                 items =
                     {
@@ -500,8 +500,8 @@
                                     {
                                     helptxt = "dummy";
                                     bmpfile = BITMAP_DIR"\\calendar.mif";
-                                    bmpid = EMbmCalendarQgn_indi_cale_tb_right;
-                                    bmpmask = EMbmCalendarQgn_indi_cale_tb_right_mask;
+                                    bmpid = EMbmCalendarQgn_indi_cale_tb_changeview;
+                                    bmpmask = EMbmCalendarQgn_indi_cale_tb_changeview_mask;
                                     extension = r_calen_tb_ext_qgn_indi_cale_tb_right;
                                     }
                                 };
@@ -532,8 +532,8 @@
                 {
                 helptxt = qtn_cale_tb_change_view_tooltip;
                 bmpFile = BITMAP_DIR"\\calendar.mif";
-                bmpId = EMbmCalendarQgn_indi_cale_tb_right;
-                bmpMask = EMbmCalendarQgn_indi_cale_tb_right_mask ;
+                bmpId = EMbmCalendarQgn_indi_cale_tb_changeview;
+                bmpMask = EMbmCalendarQgn_indi_cale_tb_changeview_mask ;
                 extension = r_calen_tb_ext_qgn_indi_cale_tb_right;
                 items =
                     {
@@ -550,8 +550,8 @@
                                     {
                                     helptxt = "dummy";
                                     bmpfile = BITMAP_DIR"\\calendar.mif";
-                                    bmpid = EMbmCalendarQgn_indi_cale_tb_right;
-                                    bmpmask = EMbmCalendarQgn_indi_cale_tb_right_mask;
+                                    bmpid = EMbmCalendarQgn_indi_cale_tb_changeview;
+                                    bmpmask = EMbmCalendarQgn_indi_cale_tb_changeview_mask;
                                     extension = r_calen_tb_ext_qgn_indi_cale_tb_right;
                                     }
                                 };
@@ -573,8 +573,8 @@
                         {
                         helptxt = qtn_cale_tb_today_tooltip;
                         bmpfile = BITMAP_DIR"\\calendar.mif";
-                        bmpid = EMbmCalendarQgn_indi_repeat_add;
-                        bmpmask = EMbmCalendarQgn_indi_repeat_add_mask;
+                        bmpid = EMbmCalendarQgn_indi_cale_tb_today;
+                        bmpmask = EMbmCalendarQgn_indi_cale_tb_today_mask;
                         extension = r_calen_tb_ext_qgn_indi_cale_tb_repeat_add;
                         }
                     };

--- a/calendarui/controller/src/calenalarmmanager.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/controller/src/calenalarmmanager.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -885,12 +885,16 @@
     {
     TRACE_ENTRY_POINT;
     
-    for(TInt index=0;index<iMissedAlarmList.Count();index++)
+    for(TInt index=0;index<iMissedAlarmList.Count();)
         {
         if(iMissedAlarmList[index].iInstanceViewed)
             {
             iMissedAlarmList.Remove(index);
             }
+        else
+			{
+        	index++;
+			}
         }
     
     TRACE_EXIT_POINT;

--- a/calendarui/controller/src/calenattachmentui.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/controller/src/calenattachmentui.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -348,12 +348,7 @@
     {
     TRACE_ENTRY_POINT;       
     
-    TAiwVariant sizeLimit( KCalenAttachmentOverhead );
-    TAiwGenericParam sizeLimitParam( EGenericParamMMSSizeLimit, sizeLimit );
-
-    CAiwGenericParamList* paramList = CAiwGenericParamList::NewLC();
-    paramList->AppendL( sizeLimitParam );
-    
+       
     CDesCArrayFlat* files = new( ELeave ) CDesC16ArrayFlat(1);
     CleanupStack::PushL(files);
     
@@ -371,7 +366,7 @@
         {       
         // used for fetching media file and notes 
         fetchOk = CCalenAttachmentUtils::FetchFileL( aFetchType, *files,
-                                        paramList, EFalse, EFalse, this );
+                                        NULL, EFalse, EFalse, this );
     
         
         if(fetchOk && iSelectedCommand == ECalenAddNote)
@@ -379,7 +374,7 @@
             AddAttachmentL(files->MdcaPoint(0));
             }                
         }
-    CleanupStack::PopAndDestroy( 2, paramList );
+    CleanupStack::PopAndDestroy( files );
     
     if(!fetchOk)
         {
@@ -659,15 +654,12 @@
                 if(attachmentInfo->StoreType() == CCalenAttachmentInfo::ECalenNewAttachment)
                     {
                     TParsePtrC fileNameParser(attachmentInfo->SystemFileName());
-                    RFile fileHandle;    
-                    CEikonEnv* eikonEnv = CEikonEnv::Static();
-                    RFs& fs = eikonEnv->FsSession();
-                    User::LeaveIfError(fs.ShareProtected());
+                    RFile fileHandle = iAttachmentModel->GetAttachmentFileL(index);
+                    CleanupClosePushL(fileHandle);
                     TInt aSize;
-                    TInt err = fileHandle.Open(fs, attachmentInfo->SystemFileName(), EFileWrite);
                     TInt error = fileHandle.Size(aSize);
                     HBufC8* data = HBufC8::NewLC(aSize);
-                    TPtr8 fileData = data->Des();
+                    TPtr8 fileData = data->Des();         
                     if (error == KErrNone)
                         {                
                         TInt readingError = fileHandle.Read(fileData,aSize);  
@@ -681,14 +673,11 @@
                             attachment->SetLabelL(fileNameParser.NameAndExt());
                             // sets mime type for the attachment
                             attachment->SetMimeTypeL(attachmentInfo->DataType().Des8());
-                            
-                            CleanupClosePushL(fileHandle);
-                            CleanupStack::PopAndDestroy(&fileHandle);
                             entry->AddAttachmentL(*attachment);
                             CleanupStack::Pop(attachment);
                             }                
                         }
-                    
+                        CleanupStack::PopAndDestroy(&fileHandle);
                     }
                 }
                         

--- a/calendarui/controller/src/calencontroller.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/controller/src/calencontroller.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -299,23 +299,55 @@
 // ----------------------------------------------------------------------------
 //
 CCalenController::~CCalenController()
-    {
+    {    
     TRACE_ENTRY_POINT;
+
+    if(iSystemTimeChangedMsgDelayer)
+        {
+        iSystemTimeChangedMsgDelayer->Cancel();
+        delete iSystemTimeChangedMsgDelayer;
+        iSystemTimeChangedMsgDelayer = NULL;
+        }
     
+    if(iAttachmentData)
+        {
+        delete iAttachmentData;
+        iAttachmentData = NULL;
+        }
+
+    if( iAlarmManager )
+        {
+        delete iAlarmManager;
+        }
+
+    if( iCustomisationManager )
+        {
+        delete iCustomisationManager;
+        }
+
+    if( iViewManager )
+        {
+        delete iViewManager;
+        }
+
+    if ( iSetting )
+        {
+        iSetting->Release();
+        }
+
+    if( iActionUi )
+        {
+        delete iActionUi;
+        }
+
     if ( iServices )
         {
         iServices->Release();
         }
-        
-    delete iActionUi;
-    delete iNotifier;
 
-    delete iViewManager;
-    delete iStateMachine;
-    
-    if ( iSetting )
+    if( iCmdLineLauncher )
         {
-        iSetting->Release();
+        delete iCmdLineLauncher;
         }
 
     if( iGlobalData )
@@ -323,31 +355,22 @@
         iGlobalData->Release();
         }
 
-    Dll::SetTls( NULL );
-
-    delete iCmdLineLauncher;
-    delete iCustomisationManager;
+    if( iNotifier )
+        {
+        delete iNotifier;
+        }
 
-    if( iResourceFileOffset )
-        {
-        CCoeEnv::Static()->DeleteResourceFile( iResourceFileOffset );
-        }
-    //delete iMultipleDbmanager;
-    
-    if(iSystemTimeChangedMsgDelayer)
+    if( iStateMachine )
         {
-        iSystemTimeChangedMsgDelayer->Cancel();
-        delete iSystemTimeChangedMsgDelayer;
-        iSystemTimeChangedMsgDelayer = NULL;
+        delete iStateMachine;
         }
+
+   if( iResourceFileOffset )
+       {
+       CCoeEnv::Static()->DeleteResourceFile( iResourceFileOffset );
+       }
+    Dll::SetTls( NULL );
     
-    delete iAlarmManager;
-    
-    if(iAttachmentData)
-        {
-        delete iAttachmentData;
-        iAttachmentData = NULL;
-        }
     TRACE_EXIT_POINT;
     }
 

--- a/calendarui/controller/src/caleneditui.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/controller/src/caleneditui.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -242,7 +242,7 @@
             // by the user.
             else
                 {
-                iController.BroadcastNotification( ECalenNotifyDialogClosed );
+                iController.BroadcastNotification( ECalenNotifyEntrySendCancel );
                 }
                 
             }

--- a/calendarui/controller/src/calennotifier.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/controller/src/calennotifier.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -71,36 +71,6 @@
     {
     TRACE_ENTRY_POINT;
 
-    // Stop database change notifications.
-    delete iDbChangeNotifier;
-
-    // Stop ECom change notifications
-    delete iEComWatcher;
-
-    // Release the global data
-    if( iGlobalData )
-        {
-        // stop listening for calendar file change notifications
-        iGlobalData->CalSessionL().StopFileChangeNotification();
-        iGlobalData->Release();
-        }
-
-    if( iSetting )
-        {
-        iSetting->Release();
-        }
-
-    // Stop environment change notifications
-    if( iEnvChangeNotifier )
-        {
-        iEnvChangeNotifier->Cancel();
-        delete iEnvChangeNotifier;
-        }
-
-    // Stop settings change notifications
-    delete iCenRepChangeNotifier;
-    delete iRepository;
-
     // Reset the handler array.
     // Before we reset , close hashset for each handler
     for(TInt i = 0 ; i < iHandlers.Count() ; i++)
@@ -111,13 +81,65 @@
     iHandlers.Reset();
     iBroadcastQueue.Reset();
 
-	
-	
-	iAsyncCallback->Cancel();
-	delete iAsyncCallback;
-	
-	delete iFilnameDeleted;
-	
+    if( iAsyncCallback )
+        {
+        iAsyncCallback->Cancel();
+        delete iAsyncCallback;
+        iAsyncCallback = NULL;
+        }
+    
+    if( iFilnameDeleted )
+        {
+        delete iFilnameDeleted;
+        iFilnameDeleted = NULL;
+        }
+    
+    // Stop ECom change notifications
+    if( iEComWatcher )
+        {
+        delete iEComWatcher;
+        iEComWatcher = NULL;
+        }
+
+    // Stop database change notifications.
+    if( iDbChangeNotifier )
+        {
+        delete iDbChangeNotifier;
+        iDbChangeNotifier = NULL;
+        }
+    
+    // Stop settings change notifications
+    if( iCenRepChangeNotifier )
+        {
+        delete iCenRepChangeNotifier;
+        iCenRepChangeNotifier = NULL;
+        }
+    
+    if( iRepository )
+        {
+        delete iRepository;
+        iRepository = NULL;
+        }
+    
+    // Stop environment change notifications
+    if( iEnvChangeNotifier )
+        {
+        iEnvChangeNotifier->Cancel();
+        delete iEnvChangeNotifier;
+        }
+    
+    if( iSetting )
+        {
+        iSetting->Release();
+        }
+    
+    // Release the global data
+    if( iGlobalData )
+        {
+        // stop listening for calendar file change notifications
+        iGlobalData->CalSessionL().StopFileChangeNotification();
+        iGlobalData->Release();
+        }
 	TRACE_EXIT_POINT;
 	}
 

--- a/calendarui/controller/src/calensendingstate.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/controller/src/calensendingstate.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -120,6 +120,7 @@
 
     switch( aNotification )
         {
+        case ECalenNotifyEntrySendCancel:
         case ECalenNotifyDialogClosed:  // issued when send method query dialog is cancelled
         	{
         	// FIXME Should have a ECalenNotifyEntrySent?

--- a/calendarui/controller/src/calenviewattachmentsdialog.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/controller/src/calenviewattachmentsdialog.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -251,7 +251,9 @@
 
                 TDataType datatype( attInfo.DataType() );
                 RFile file = iAttachmentModel.GetAttachmentFileL( index );
-                OpenAttachmentViewerL(file, *this);                
+                CleanupClosePushL(file);
+                OpenAttachmentViewerL(file, *this);
+                CleanupStack::PopAndDestroy(&file);
                 }                                
             }
         break;
@@ -1084,50 +1086,32 @@
 // Opens a particular attachment
 // -----------------------------------------------------------------------------
 //
-void CCalenViewAttachmentsDialog::OpenAttachmentViewerL(RFile& file, MAknServerAppExitObserver& /*aExitObserver*/)
+void CCalenViewAttachmentsDialog::OpenAttachmentViewerL(RFile& aFile, MAknServerAppExitObserver& /*aExitObserver*/)
     {
     TRACE_ENTRY_POINT;
     
     TBuf<250> fileName;
-    file.FullName(fileName);
-    TDataType datatype( CCalenAttachmentUtils::GetMimeTypeL(fileName) );
+    aFile.FullName(fileName);
+    TDataType datatype( CCalenAttachmentUtils::GetMimeType(aFile) );
     
     TInt ret = KErrNone;
     
-    file.Close();
-    RFs& fs = CEikonEnv::Static()->FsSession();
-                    
-    //open the file, before giving it to Notepad.
-    TInt err1 = file.Open( fs, fileName, EFileRead | EFileShareReadersOnly );
-    CleanupClosePushL( file );        
-    
     if(datatype == KNotePadTextDataType())
         {
-        const TDesC& notepadTitle = _L("NotePad");	
-        // file handle ownership transferred.
-        
-        // 1.File handle from arg has problem for notes since junk chars are reported in file.
-        // so we use another file handle exclusively open with filename an pass to note viewer.   
-        // 
-        // 2.Pass ETrue to 4th param  ExecFileViewerL , to guess encoding.
-        RFile fileForNotes;
-        TInt err = fileForNotes.Open( fs, fileName, EFileRead | EFileShareReadersOnly );
-        CleanupClosePushL( fileForNotes );
-        ret = CNotepadApi::ExecFileViewerL( fileForNotes, 
+        const TDesC& notepadTitle = _L("NotePad");
+        ret = CNotepadApi::ExecFileViewerL( aFile, 
                                            &notepadTitle,
                                            ETrue,
                                            ETrue,
                                            KCharacterSetIdentifierIso88591 );
         
-        CleanupStack::PopAndDestroy(&fileForNotes);
         }
     else
         {
         //doc handler will open the other files (other than text file).
-        TRAP( ret, iDocHandler->OpenFileEmbeddedL( file, datatype ) );
+        TRAP( ret, iDocHandler->OpenFileEmbeddedL( aFile, datatype ) );
         }
-    CleanupStack::PopAndDestroy(&file);
-    
+
     switch(ret)
         {
         case KErrNone:

--- a/calendarui/editors/data/CalenDefaultEditorsData.rss	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/editors/data/CalenDefaultEditorsData.rss	Fri Mar 12 15:42:35 2010 +0200
@@ -1457,7 +1457,7 @@
             },
         LBUF
             {
-            txt = qtn_cale_item_birthday;
+            txt = qtn_cale_note_anniversary;
             },
         LBUF
             {
@@ -1656,4 +1656,42 @@
         };
     }
 
+// ---------------------------------------------------------
+// Description list query
+// List query for the description types
+// ---------------------------------------------------------
+RESOURCE AVKON_MULTISELECTION_LIST_QUERY r_description_list_query
+    {
+    flags = EGeneralQueryFlags;
+    softkeys = R_AVKON_SOFTKEYS_SELECT_CANCEL__SELECT;
+    items =
+        {
+        AVKON_MULTISELECTION_LIST_QUERY_DLG_LINE
+            {
+            control = AVKON_LIST_QUERY_CONTROL
+                {
+                listtype = EAknCtSinglePopupMenuListBox;
+                listbox = AVKON_LIST_QUERY_LIST
+                    {
+                    array_id = r_description_list_query_array;
+                    };
+                heading = text_softkey_select;
+                };
+            }
+        };
+    }
+
+// ---------------------------------------------------------
+// Description list query array
+// List of the description types
+// ---------------------------------------------------------
+RESOURCE ARRAY r_description_list_query_array
+    {
+    items=
+        {
+        LBUF { txt = qtn_cale_om_descript_new; },
+        LBUF { txt = qtn_cale_om_descript_exist; }
+        };
+    }
+
 // End of File

--- a/calendarui/editors/inc/CalenDescription.h	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/editors/inc/CalenDescription.h	Fri Mar 12 15:42:35 2010 +0200
@@ -181,6 +181,11 @@
      */
     HBufC* ExecTextViewerL(TInt& aStatus, const TDesC& aDescription);
     
+    /**
+     * Handles ECalenCmdAddDescription command 
+     */
+    TBool HandleAddDescriptionL();
+    
         
 private:
     

--- a/calendarui/editors/inc/calenunifiededitor.h	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/editors/inc/calenunifiededitor.h	Fri Mar 12 15:42:35 2010 +0200
@@ -494,6 +494,13 @@
          */
         void VerifyCollectionIdL(const TCalCollectionId aColId);
         
+        /*
+         * Return attachment names
+         * @param aAttachmentNames names of the attachments.
+         * @return HBufC 
+         */
+        void GetAttachmentNamesL(RPointerArray<HBufC>& aAttachmentNames);
+        
     protected:
         /**
          * From CEikDialog
@@ -659,7 +666,10 @@
           *  
           */
          void HideFieldsForEditSingleInstance();
-
+         
+         static TInt AsyncProcessCommandL(TAny* aThisPtr); 
+         
+        
     private:
         /**
          * @var iEditedCalEntry
@@ -812,7 +822,10 @@
          * @var isReplaceLocation
          * @brief Flag to indicate whenter to replace the location or to append it
          */
-        TBool isReplaceLocation;
+        TBool isReplaceLocation;        
+        
+        CAsyncCallBack* iAsyncCallback; 
+        
     };
 
 /**

--- a/calendarui/editors/src/CalenDescription.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/editors/src/CalenDescription.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -192,12 +192,6 @@
     TBool processed = EFalse;
     switch( aCommandId )
         {
-        case ECalenCmdShowDescription:
-            {
-            ShowL();
-            processed = ETrue;
-            break;
-            }
         case ECalenCmdAddDescriptionNew:
             {
             AddNewL();
@@ -210,6 +204,28 @@
             processed = ETrue;
             break;
             }
+        case ECalenCmdAddDescription:
+            {
+            if(EntryHasDescription())
+                {
+                ShowL();
+                processed = ETrue;
+                }
+            else
+                {
+                processed = HandleAddDescriptionL();
+                }
+            
+            break;
+            }
+
+        case ECalenCmdShowDescription:
+            {
+
+            ShowL();
+            processed = ETrue;
+            break;
+            }
         case ECalenCmdRemoveDescription:
             {
             RemoveL();
@@ -583,4 +599,46 @@
     TRACE_EXIT_POINT;
     return desc;
     }
+
+// ----------------------------------------------------------------------------
+// CCalenDescription::HandleAddDescriptionL
+// Handles the command ECalenAddDescription
+// ----------------------------------------------------------------------------
+// 
+TBool CCalenDescription::HandleAddDescriptionL()
+    {
+    TRACE_ENTRY_POINT;
+    
+    TBool processed = EFalse;
+    TInt selectedIndex(0);
+    CAknListQueryDialog* dlg = new (ELeave) CAknListQueryDialog(&selectedIndex);
+    dlg->PrepareLC( R_DESCRIPTION_LIST_QUERY );
+    
+    if(dlg->RunLD())
+        {
+        switch(selectedIndex)
+            {
+            case 0:             //ECalenCmdAddDescriptionNew
+                {
+//                iCheck = 0;
+                AddNewL();
+                processed = ETrue;
+                break;
+                }
+            case 1:             //ECalenCmdAddDescriptionExisting
+                {
+//                iCheck = 1;
+                AddMemoL();
+                processed = ETrue;
+                break;
+                }
+            default:
+                break;
+            }
+        }
+    
+    TRACE_EXIT_POINT;
+    
+    return processed;   
+    }
 //  End of File

--- a/calendarui/editors/src/calenunifiededitor.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/editors/src/calenunifiededitor.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -165,7 +165,10 @@
     delete iUnifiedEditorControl;
     
     iCollectionIds.Reset();
-
+    
+    iAsyncCallback->Cancel();
+    delete iAsyncCallback;
+    
     TRACE_EXIT_POINT;
     }
 
@@ -285,6 +288,11 @@
     
     isReplaceLocation = EFalse;
     
+   
+    TCallBack callback(CCalenUnifiedEditor::AsyncProcessCommandL,this);
+    iAsyncCallback = new(ELeave) CAsyncCallBack(callback,CActive::EPriorityStandard);
+    
+    
     iIdle = CIdle::NewL( CActive::EPriorityUserInput );
     iIdle->Start( TCallBack( KeyCallBack, this) );
     iCoeEnv->AddFepObserverL( *this );
@@ -1242,7 +1250,22 @@
                             }
                         break;
                         }
-
+                       
+                    case ECalenEditorDescription:
+                        {
+//                        CEikEdwin* edwin = static_cast<CEikEdwin*>( Control( focusControl ) );  
+//                        if ( edwin && edwin->Text()->DocumentLength() == 0 )
+//                            {
+//                                ProcessCommandL( ECalenCmdAddDescription );
+//                            }
+//                        else
+//                            {
+//                                ProcessCommandL( ECalenCmdShowDescription );
+//                            }
+                        iAsyncCallback->CallBack();
+                        break;
+                        }
+                       
                     default:
                         {
                         break;
@@ -1275,6 +1298,24 @@
         }
     }
 
+
+TInt CCalenUnifiedEditor::AsyncProcessCommandL( TAny* aThisPtr )
+    {
+    TInt focusControl( static_cast<CCalenUnifiedEditor*>(aThisPtr)->IdOfFocusControl() );
+    CEikEdwin* edwin = static_cast<CEikEdwin*>( static_cast<CCalenUnifiedEditor*>(aThisPtr)->Control( focusControl ) );  
+        if ( edwin && edwin->Text()->DocumentLength() == 0 )
+            {
+            static_cast<CCalenUnifiedEditor*>(aThisPtr)->ProcessCommandL(ECalenCmdAddDescription);
+            }
+        else
+            {
+            static_cast<CCalenUnifiedEditor*>(aThisPtr)->ProcessCommandL(ECalenCmdShowDescription);
+            }
+    
+    return 0;
+    }
+
+
 // -----------------------------------------------------------------------------
 //  CCalenUnifiedEditor::HandleResourceChange
 //  Handdles the resource change
@@ -1525,13 +1566,10 @@
     TRACE_ENTRY_POINT;
 
     // Only insert if there is some summary (or location)
-    if( !EditorDataHandler().AreTextFieldsEmptyL() )
+    // Changes done to remove Lunar calendar item from options menu
+    if( EditorDataHandler().AreTextFieldsEmptyL() )
         {
-        // Insert Send menu item
-        iServices->OfferMenuPaneL( aResourceId, aMenuPane );
-        }
-    else
-        {// Delete Send Menu item if exists
+        // Delete Send Menu item if exists
         aMenuPane->DeleteMenuItem( ECalenSend );
         }    
 
@@ -1981,7 +2019,8 @@
         if( startDate == CalenDateUtils::BeginningOfDay( startDate ) &&
                 endDate == CalenDateUtils::BeginningOfDay( endDate ) )
             {
-            if( CCalEntry::EAppt == Edited().EntryType() && startDate != endDate )
+            TTimeIntervalDays differenceInTime = endDate.DaysFrom(startDate); // fix for AllDayEntry issue
+            if( CCalEntry::EAppt == Edited().EntryType() && startDate != endDate && differenceInTime.Int() == 1 )
                 {
                 Edited().SetEntryType( CCalEntry::EEvent );
                 }
@@ -2238,6 +2277,7 @@
     
     if(!IsCreatingNewEntry() && !iEditorDataHandler->IsCalendarEditedL())
         {
+        iServices->GetAttachmentData()->Reset();
         iServices->EntryViewL(iEditorDataHandler->PreviousDbCollectionId())
                                                 ->DeleteL(*iOriginalCalEntry);
         }
@@ -2268,6 +2308,7 @@
         }
     if(!IsCreatingNewEntry() && iEditorDataHandler->IsCalendarEditedL())
         {
+        iServices->GetAttachmentData()->Reset();
         iServices->EntryViewL(iEditorDataHandler->PreviousDbCollectionId())
                                                 ->DeleteL(*iOriginalCalEntry);
         }
@@ -3050,9 +3091,9 @@
     if( attachmentCount )
         {
         RPointerArray<HBufC> attachmentNames;
-        Edited().AttachmentNamesL(attachmentNames);
-        TInt attachmentCount = attachmentNames.Count();
-        TInt attachmentLength(0);
+        GetAttachmentNamesL(attachmentNames);
+        attachmentCount = attachmentNames.Count();            
+        TInt attachmentLength(0);        
         for( TInt index =0; index<attachmentCount; index++ )
             {
             if(index>0)
@@ -3340,6 +3381,33 @@
     
     TRACE_EXIT_POINT;   
     }
+
+// -----------------------------------------------------------------------------
+// CCalenUnifiedEditor::AttachmentNamesL
+// Provides all the attachments names
+// -----------------------------------------------------------------------------
+// 
+void CCalenUnifiedEditor::GetAttachmentNamesL(RPointerArray<HBufC>& aAttachmentNames)
+    {
+    TInt attachCount = iServices->GetAttachmentData()->NumberOfItems();
+    if( attachCount )
+        {    
+        RPointerArray<CCalenAttachmentInfo> attachmentInfoList;      
+        iServices->GetAttachmentData()->GetAttachmentListL(attachmentInfoList);
+        for( TInt index =0; index<attachCount; index++ )
+            {
+            CCalenAttachmentInfo* attachmentInfo = attachmentInfoList[index];
+            TParsePtrC fileNameParser( attachmentInfo->FileName() );
+            HBufC* attachmentName = HBufC::NewL(fileNameParser.NameAndExt().Length());
+            attachmentName->Des().Copy(fileNameParser.NameAndExt());
+            aAttachmentNames.Append(attachmentName);
+            }
+        }
+    else
+        {
+        Edited().AttachmentNamesL(aAttachmentNames);
+        }
+    }
 	
 // -----------------------------------------------------------------------------
 // CMapsIconPicture::CMapsIconPicture

--- a/calendarui/group/bld.inf	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/group/bld.inf	Fri Mar 12 15:42:35 2010 +0200
@@ -45,6 +45,7 @@
 ../rom/CalenGlobalData.iby 				CORE_APP_LAYER_IBY_EXPORT_PATH(calenglobaldata.iby)
 ../rom/CalenSvr.iby 					CORE_APP_LAYER_IBY_EXPORT_PATH(calensvr.iby)
 ../rom/CalenSettingsUi.iby 				CORE_APP_LAYER_IBY_EXPORT_PATH(calensettingsui.iby)
+../rom/CalenSvrResources.iby                            LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(CalenSvrResources.iby)  
 
 ../rom/calenregionalutil.iby			LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(calenregionalutil.iby)
 

--- a/calendarui/loc/calendar.loc	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/loc/calendar.loc	Fri Mar 12 15:42:35 2010 +0200
@@ -2366,7 +2366,7 @@
 //l: list_form_graphic_pane_t1
 //w:
 //r: 9.2
-#define qtn_cale_item_birthday "Birthday"
+#define qtn_cale_item_anniversary "Anniversary"
 
 //d: "To-Do" text for EventType field pop-up in calendar editor
 //l: list_form_graphic_pane_t1
@@ -2623,5 +2623,10 @@
 //w:
 //r: 9.2
 #define qtn_cale_db_friends "Friends"
+
+//d:Wait note text in to-do view.
+//l:popup_note_wait_window
+//
+#define qtn_todo_wait_updating_status_notes  "Updating status"
         
 // End of File

--- a/calendarui/multicaluidialog/src/multicaluidialogimpl.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/multicaluidialog/src/multicaluidialogimpl.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -208,9 +208,17 @@
     {
     TRACE_ENTRY_POINT;
     
-    if(iDesArray && iListBox)
+    if(iListBox)
         {
-        return;
+        iListBox->Reset();
+        delete iListBox; 
+        iListBox = NULL;
+        }
+    
+    if(iDesArray)
+        {
+        delete iDesArray;
+        iDesArray = NULL;
         }
 
     iDesArray = new (ELeave) CDesCArrayFlat(5);
@@ -329,26 +337,29 @@
     TRgb nonSkinColor = AKN_LAF_COLOR(215);
     CFbsBitmap* bitmap = NULL;
     CFbsBitmap* mask = NULL;
-    
+    TAknsItemID KSearchCheckboxOff;
+    TAknsItemID KSearchCheckboxOn;    
     switch( aIndex )
         {
         case ECalenListDbIconUnMarked:
             {
-            icon = CreateBitmapSkinnedIconL( 
-                    KAknsIIDQgnPropCheckboxOn,
+            KSearchCheckboxOff.Set( 0x0A8461F4, 1 );
+            icon = CreateBitmapSkinnedIconL(                     
+                    KSearchCheckboxOff,
                     iIconFile,
                     EMbmMulticaluidialogQgn_prop_checkbox_off,
-                    EMbmMulticaluidialogQgn_prop_checkbox_off_mask );
-            }
+                    EMbmMulticaluidialogQgn_prop_checkbox_off_mask ); 
+            }            
             break;
 
         case ECalenListDbIconMarked:
             {
-            icon = CreateBitmapSkinnedIconL( 
-                                KAknsIIDQgnPropCheckboxOn,
+            KSearchCheckboxOn.Set( 0x0A8461F4, 2 ); 
+            icon = CreateBitmapSkinnedIconL(                                 
+                                KSearchCheckboxOn,
                                 iIconFile, 
                                 EMbmMulticaluidialogQgn_prop_checkbox_on,
-                                EMbmMulticaluidialogQgn_prop_checkbox_on_mask );
+                                EMbmMulticaluidialogQgn_prop_checkbox_on_mask );            
             }
             break;
             
@@ -375,12 +386,8 @@
     CAknIconArray* icons = new(ELeave) CAknIconArray( iconCount );
     CleanupStack::PushL( icons );
     icons->SetReserveL( iconCount );
-
-    for( TInt i=0; i<iconCount; ++i )
-        {
-        icons->AppendL( GetIconL( ECalenListDbIconMarked ) );
-        icons->AppendL( GetIconL( ECalenListDbIconUnMarked ) );
-        }
+    icons->AppendL( GetIconL( ECalenListDbIconMarked ) );
+    icons->AppendL( GetIconL( ECalenListDbIconUnMarked ) );
     CleanupStack::Pop( icons );
     TRACE_EXIT_POINT;
     return icons;
@@ -709,7 +716,7 @@
         else
             {
             iListBox->SetRect( rect );
-            }
+            }        
         }
     
     TRACE_EXIT_POINT;
@@ -766,10 +773,7 @@
     
     SetTitlePaneL( ETrue );
     ConstructListL();
-    UpdateListboxL();
-    //UpdateCbaL();
-    
-    
+    UpdateListboxL();    
     TInt orientation = Layout_Meta_Data::IsLandscapeOrientation() ? 1 : 0;      
     if( AknLayoutUtils::PenEnabled() )   
         {
@@ -842,14 +846,12 @@
 void CMultiCalUiDialogImpl::HandleResourceChange(TInt aType)
     {
     TRACE_ENTRY_POINT;
-    
+    CAknDialog::HandleResourceChange( aType );
     if ( aType == KAknsMessageSkinChange || aType == KEikDynamicLayoutVariantSwitch )
         {
-        SizeChanged();
-        TRAP_IGNORE(UpdateListboxL());
-        }
+        SizeChanged();       
+        }    
     
-    CAknDialog::HandleResourceChange( aType );
     TRACE_EXIT_POINT;
     }
 

--- a/calendarui/regionalplugins/Thai/src/CalenThaiPlugin.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/regionalplugins/Thai/src/CalenThaiPlugin.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -25,6 +25,11 @@
 #include <AknUtils.h>
 #include <avkon.hrh>
 
+#include <AknsSkinInstance.h>
+#include <AknsUtils.h>
+#include <gulcolor.h>
+
+
 #include "CalenThaiPlugin.h"
 
 
@@ -130,6 +135,14 @@
     aLabel.SetFont( labelFont );
     aLabel.SetLabelAlignment(ELayoutAlignCenter);
     aLabel.SetTextL( iThaiYearText );
+    MAknsSkinInstance* skin = AknsUtils::SkinInstance();
+    TRgb color;
+    TInt error = AknsUtils::GetCachedColor(skin, color,
+            KAknsIIDQsnTextColors, EAknsCIQsnTextColorsCG6);
+    if (error == KErrNone)
+        {
+        aLabel.OverrideColorL(EColorLabelText, color);
+        }
     TRACE_EXIT_POINT;
     }
 

--- a/calendarui/regionalplugins/lunarVietnamese/src/calenlunarvietnameseplugin.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/regionalplugins/lunarVietnamese/src/calenlunarvietnameseplugin.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -32,6 +32,10 @@
 #include <layoutmetadata.cdl.h>
 #include <mcalenpreview.h>
 
+#include <AknsSkinInstance.h>
+#include <AknsUtils.h>
+#include <gulcolor.h>
+
 #include "calendarui_debug.h" 
 #include "calenlunarvietnameseplugin.h"
 #include "calenlunarvietnameselocalizer.h"
@@ -203,6 +207,16 @@
     aLabel.SetLabelAlignment(ELayoutAlignCenter); 
     aLabel.SetTextL( *newLinedText);
     
+    // Query the text colour based on the theme and update the label text
+    MAknsSkinInstance* skin = AknsUtils::SkinInstance();
+    TRgb color;
+    TInt error = AknsUtils::GetCachedColor(skin, color,
+            KAknsIIDQsnTextColors, EAknsCIQsnTextColorsCG6);
+    if (error == KErrNone)
+        {
+        aLabel.OverrideColorL(EColorLabelText, color);
+        }
+    
     CleanupStack::PopAndDestroy( newLinedText );
     CleanupStack::PopAndDestroy( lineWidths );
     CleanupStack::PopAndDestroy( textLines );
@@ -227,6 +241,16 @@
     aLabel.SetLabelAlignment(ELayoutAlignCenter);
     aLabel.SetTextL(  iExtraRowText );
     
+    // Query the text colour based on the theme and update the label text
+    MAknsSkinInstance* skin = AknsUtils::SkinInstance();
+    TRgb color;
+    TInt error = AknsUtils::GetCachedColor(skin, color,
+            KAknsIIDQsnTextColors, EAknsCIQsnTextColorsCG6);
+    if (error == KErrNone)
+        {
+        aLabel.OverrideColorL(EColorLabelText, color);
+        }
+    
     TRACE_EXIT_POINT;
     }
     
@@ -673,10 +697,15 @@
 // -----------------------------------------------------------------------------
 //
 void CCalenPluginLabel::HandlePointerEventL(const TPointerEvent& 
-                                            /*aPointerEvent*/)
+                                            aPointerEvent)
 	{
 	TRACE_ENTRY_POINT;
-	iPlugin.ShowDetailsL();	
+	
+	if ( aPointerEvent.iType == TPointerEvent::EButton1Up )
+	        {
+	        iPlugin.ShowDetailsL();
+	        }
+	
 	TRACE_EXIT_POINT;
 	}
 

--- a/calendarui/regionalplugins/lunarchinese/src/CalenLunarChinesePlugin.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/regionalplugins/lunarchinese/src/CalenLunarChinesePlugin.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -31,6 +31,10 @@
 #include <layoutmetadata.cdl.h>
 #include <mcalenpreview.h>
 
+#include <AknsSkinInstance.h>
+#include <AknsUtils.h>
+#include <gulcolor.h>
+
 #include "calendarui_debug.h" 
 #include "CalenLunarChinesePlugin.h"
 #include "calenlunarpanic.h"
@@ -155,7 +159,8 @@
 // CCalenLunarChinesePlugin::SetLabelContentExtraL
 // -----------------------------------------------------------------------------
 //
-void CCalenLunarChinesePlugin::SetLabelContentExtraL( CEikLabel& aLabel ,TRect& aRect) 
+void CCalenLunarChinesePlugin::SetLabelContentExtraL(CEikLabel& aLabel,
+        TRect& aRect)
     {
     TRACE_ENTRY_POINT;
     
@@ -171,37 +176,45 @@
     CleanupStack::PushL( lineWidths );
     
     TInt maxWidth = aRect.Size().iWidth;
-    lineWidths->AppendL( maxWidth );
-    
-    const CFont* fontLabel = AknLayoutUtils::FontFromId(EAknLogicalFontPrimarySmallFont,NULL);
-    
-    HBufC* visualText = AknBidiTextUtils::ConvertToVisualAndWrapToArrayWholeTextL(
-        iExtraRowText,
-        *lineWidths,
-        *fontLabel,
-        *textLines);
-        
-    if(textLines->Count() < 3 && textLines->Count() > 0)
-    	{
-    	 TInt nH =	textLines->Count();
-    	 aRect.iBr.iY = aRect.iBr.iY * nH;
-    	}
-       
-    HBufC* newLinedText = HBufC::NewLC( iExtraRowText.Length() + 4);
-        
-    for(TInt i = 0 ; i < textLines->Count();i++)
-    	{
-    	newLinedText->Des().Append(textLines->At(i));
-    	newLinedText->Des().Append( KFieldSeparator );
-    	}
-   
+    lineWidths->AppendL(maxWidth);
+
+    const CFont* fontLabel = AknLayoutUtils::FontFromId(
+            EAknLogicalFontPrimarySmallFont, NULL);
+
+    HBufC* visualText =
+            AknBidiTextUtils::ConvertToVisualAndWrapToArrayWholeTextL(
+                    iExtraRowText, *lineWidths, *fontLabel, *textLines);
+
+    if (textLines->Count() < 3 && textLines->Count() > 0)
+        {
+        TInt nH = textLines->Count();
+        aRect.iBr.iY = aRect.iBr.iY * nH;
+        }
+
+    HBufC* newLinedText = HBufC::NewLC(iExtraRowText.Length() + 4);
+
+    for (TInt i = 0; i < textLines->Count(); i++)
+        {
+        newLinedText->Des().Append(textLines->At(i));
+        newLinedText->Des().Append(KFieldSeparator);
+        }
+
     aLabel.UseLogicalToVisualConversion(ETrue);
     aLabel.SetLabelAlignment(ELayoutAlignCenter); 
     aLabel.SetTextL( *newLinedText);
     
-    CleanupStack::PopAndDestroy( newLinedText );
-    CleanupStack::PopAndDestroy( lineWidths );
-    CleanupStack::PopAndDestroy( textLines );
+    // Query the text colour based on the theme and update the label text
+    MAknsSkinInstance* skin = AknsUtils::SkinInstance();
+    TRgb color;
+    TInt error = AknsUtils::GetCachedColor(skin, color,
+            KAknsIIDQsnTextColors, EAknsCIQsnTextColorsCG6);
+    if (error == KErrNone)
+        {
+        aLabel.OverrideColorL(EColorLabelText, color);
+        }
+    CleanupStack::PopAndDestroy(newLinedText);
+    CleanupStack::PopAndDestroy(lineWidths);
+    CleanupStack::PopAndDestroy(textLines);
     delete visualText;
 
     TRACE_EXIT_POINT;
@@ -211,7 +224,8 @@
 // CCalenLunarChinesePlugin::SetLabelContentL
 // -----------------------------------------------------------------------------
 //
-void CCalenLunarChinesePlugin::SetLabelContentL( CEikLabel& aLabel, const TRect& /*aRect*/ ) 
+void CCalenLunarChinesePlugin::SetLabelContentL(CEikLabel& aLabel,
+        const TRect& /*aRect*/)
     {
     TRACE_ENTRY_POINT;
     TRect nullRect(0,0,0,0);
@@ -222,6 +236,16 @@
     aLabel.SetLabelAlignment(ELayoutAlignCenter);
     aLabel.SetTextL(  iExtraRowText );
     
+    // Query the text colour based on the theme and update the label text
+    MAknsSkinInstance* skin = AknsUtils::SkinInstance();
+    TRgb color;
+    TInt error = AknsUtils::GetCachedColor(skin, color,
+            KAknsIIDQsnTextColors, EAknsCIQsnTextColorsCG6);
+    if (error == KErrNone)
+        {
+        aLabel.OverrideColorL(EColorLabelText, color);
+        }
+
     TRACE_EXIT_POINT;
     }
     
@@ -671,12 +695,17 @@
 // -----------------------------------------------------------------------------
 //
 void CCalenPluginLabel::HandlePointerEventL(const TPointerEvent& 
-                                                                /*aPointerEvent*/)
-	{
-	TRACE_ENTRY_POINT;
-	iPlugin.ShowDetailsL();	
-	TRACE_EXIT_POINT;
-	}
+                                                                aPointerEvent)
+    {
+    TRACE_ENTRY_POINT;
+
+    if ( aPointerEvent.iType == TPointerEvent::EButton1Up )
+        {
+        iPlugin.ShowDetailsL();
+        }
+
+    TRACE_EXIT_POINT;
+    }
 
 //EOF
 

--- a/calendarui/rom/CalenSvr.iby	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/rom/CalenSvr.iby	Fri Mar 12 15:42:35 2010 +0200
@@ -22,7 +22,7 @@
 
 file=ABI_DIR\BUILD_DIR\CalenSvrClient.dll   SHARED_LIB_DIR\CalenSvrClient.dll
 file=ABI_DIR\BUILD_DIR\CalenSvr.exe         PROGRAMS_DIR\CalenSvr.exe
-data=DATAZ_\RESOURCE_FILES_DIR\CalenSvrMissedAlarmManagerResource.rsc    RESOURCE_FILES_DIR\CalenSvrMissedAlarmManagerResource.rsc
+
 
 
 #endif // CALENSVR_IBY

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/rom/CalenSvrResources.iby	Fri Mar 12 15:42:35 2010 +0200
@@ -0,0 +1,27 @@
+/*
+* Copyright (c) 2002 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:   IBY file for Calendar Server.
+*
+*/
+
+
+
+#ifndef CALENSVRRESOURCES_IBY
+#define CALENSVRRESOURCES_IBY
+
+data=DATAZ_\RESOURCE_FILES_DIR\CalenSvrMissedAlarmManagerResource.rsc    RESOURCE_FILES_DIR\CalenSvrMissedAlarmManagerResource.rsc
+
+#endif // CALENSVRRESOURCES_IBY
+
+//  End of File
\ No newline at end of file

--- a/calendarui/settings/settingsui/group/calensettingsui.mmp	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/settings/settingsui/group/calensettingsui.mmp	Fri Mar 12 15:42:35 2010 +0200
@@ -85,6 +85,7 @@
 LIBRARY             caf.lib
 LIBRARY             cafutils.lib
 LIBRARY             drmhelper.lib
+LIBRARY			MediaFileList.lib
 
 // File logging
 LIBRARY flogger.lib

--- a/calendarui/settings/settingsui/src/CalenFileListSettingItem.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/settings/settingsui/src/CalenFileListSettingItem.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -41,6 +41,8 @@
 // KDC_RESOURCE_DIR definition
 #include <data_caging_path_literals.hrh>
 
+#include <mediafilelist.h>
+
 
 // ============================ MEMBER FUNCTIONS ===============================
 
@@ -214,6 +216,8 @@
     {
     TRACE_ENTRY_POINT;
 
+#define NEW_MEDIA_FILE_LIST_API
+#ifndef NEW_MEDIA_FILE_LIST_API
     // Create instance of FileList using new FileList API
     CFLDFileListContainer* filelist = CFLDFileListContainer::NewLC();
 
@@ -228,14 +232,44 @@
     
     TBool ok( filelist->LaunchL( iToneFile, *iPopupHeader ) );
 
-    if( ok )
+
+    CleanupStack::PopAndDestroy( filelist ); // filelist
+#else
+    CMediaFileList* list = CMediaFileList::NewL();
+    CleanupStack::PushL(list);
+    
+    
+    TInt nullItem = KErrNotFound;
+    
+    // off
+    list->SetNullItemL(*iToneOffText, iOffToneFile,
+            CMediaFileList::EMediaFileTypeAudio,
+            CMediaFileList::ENullItemIconOff);
+    
+    // default tone
+    list->SetNullItemL(*iToneDefaultText, iDefaultToneFile,
+            CMediaFileList::EMediaFileTypeAudio,
+            CMediaFileList::ENullItemIconOff);
+    
+    list->SetAttrL(CMediaFileList::EAttrExcludeMimeType, CMediaFileList::EMediaFileTypeVideo);
+    list->SetAttrL(CMediaFileList::EAttrAutomatedType, CDRMHelper::EAutomatedTypeCalendarAlarm);
+    
+    // Make sure that iOffToneFile is passed, in case iToneFile happens to be KNullDesC
+    ASSERT(!IsEmpty(iToneFile));
+    
+    TBool ok = !list->ShowMediaFileListL(&iToneFile, &nullItem,
+                NULL, NULL );
+    
+    
+    CleanupStack::PopAndDestroy(list);    
+#endif
+    
+    if (ok)
         {
         iAlarmSoundChanged = ETrue;
         StoreL();
-        UpdateListBoxTextL(); 
+        UpdateListBoxTextL();
         }
-
-    CleanupStack::PopAndDestroy( filelist ); // filelist
     
     TRACE_EXIT_POINT;
     }

--- a/calendarui/settings/settingsui/src/calensettingsuicontainer.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/settings/settingsui/src/calensettingsuicontainer.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -659,9 +659,6 @@
     // Construct setting item with parametrized values
     HBufC* itemTitle = StringLoader::LoadLC( R_CALEN_SETTING_DEFAULTMAILBOX_TITLE );
     // The resources loaded up here are empty as the items need to be dynamically updated.
-    
-    settingItem->SetEmptyItemTextL( KNullDesC );
-    
     settingItem->ConstructL( EFalse, aOrdinal, *itemTitle, NULL,
                              R_CALEN_SETTING_DEFAULTMAILBOX, EAknCtPopupSettingList,
                              NULL, R_CALEN_EMPTY_POPUP_SETTING_TEXTS );
@@ -791,7 +788,7 @@
 
     // Always add this in. We will set it hidden when it's not needed (i.e. when the
     // week start is set to anything other than "Monday") at the bottom of this function.
-    AddEnumerationItemL( iWeekTitle,
+    AddBinaryItemL( iWeekTitle,
                          ECalenWeekTitleItemId,
                          R_CALEN_SETTING_WEEKTITLE_TITLE,
                          R_CALEN_SETTING_WEEKTITLE,

--- a/calendarui/views/inc/calencontainer.h	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/views/inc/calencontainer.h	Fri Mar 12 15:42:35 2010 +0200
@@ -44,6 +44,7 @@
 class CEikLabel;
 class MCalenContext;
 class CCalenContainerLayoutManager;
+class MCalenPreview;
 
 
 class MAknNaviDecoratorObserver;
@@ -241,6 +242,10 @@
      */
     void UpdateTodayToolbarItemL();
     
+	/**
+     * returns previewpane pointer
+     */
+    virtual const MCalenPreview* PreviewPane(){return NULL; };
 private: // New functions
     /**
      * Return number of icons needed to be displayed

--- a/calendarui/views/inc/calenmonthcontainer.h	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/views/inc/calenmonthcontainer.h	Fri Mar 12 15:42:35 2010 +0200
@@ -127,6 +127,11 @@
     void HidePopup();
     
     void RedrawPreviewPane();
+    
+    /**
+     * returns previewpane pointer
+     */    
+    const MCalenPreview* PreviewPane();
 
 
 private:    // New function
@@ -364,8 +369,7 @@
     // View specific data, references to views data
     TTime& iDate;
     TTime iOldFirstDayOfGrid;
-	TBool iChangeMonth;
-	TBool iNativePreview;
+	TBool iChangeMonth;	
     };
 
 #endif //CALENMONTHCONT_H

--- a/calendarui/views/inc/calenweekcontainer.h	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/views/inc/calenweekcontainer.h	Fri Mar 12 15:42:35 2010 +0200
@@ -178,6 +178,11 @@
 	* Cleanup instances
 	*/
     void CleanupInstances();
+    
+    /**
+     * returns previewpane pointer
+     */
+    const MCalenPreview* PreviewPane();
         
 public:
     /**
@@ -433,8 +438,7 @@
     
     TBool iTopRowDefault;
     TBool iRow;
-    TBool iValidDay;
-    TBool iNativePreview;
+    TBool iValidDay;   
     };
 
 #endif //CALENWEEKCONT_H

--- a/calendarui/views/src/calencontainer.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/views/src/calencontainer.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -826,29 +826,24 @@
 TRect CCalenContainer::ReducePreview( TRect aRect ) const
     {
     TRACE_ENTRY_POINT;
-    if (UsePreview() )
-        {
-        // Find the application window
-        TRect screenRect;
-        TAknLayoutRect application_window;
-        AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EScreen, 
-                                           screenRect );
-        application_window.LayoutRect( 
-            screenRect, 
-            AknLayoutScalable_Apps::application_window().LayoutLine() ); 
-            
-        // Find the size of the main pane when the preview is valid.
-        TAknLayoutRect main_pane;
-        
-        TInt orientation = Layout_Meta_Data::IsLandscapeOrientation() ? 1 : 0;
-        
-        main_pane.LayoutRect( 
-            application_window.Rect(), 
-            AknLayoutScalable_Apps::main_pane( orientation + 10 ).LayoutLine() );
+    
+    // Find the application window
+    TRect screenRect;
+    TAknLayoutRect application_window;
+    AknLayoutUtils::LayoutMetricsRect(AknLayoutUtils::EScreen, screenRect);
+    application_window.LayoutRect(screenRect,
+            AknLayoutScalable_Apps::application_window().LayoutLine());
 
-        aRect.SetWidth( main_pane.Rect().Width() );
-        aRect.SetHeight( main_pane.Rect().Height() );
-        }
+    // Find the size of the main pane when the preview is valid.
+    TAknLayoutRect main_pane;
+
+    TInt orientation = Layout_Meta_Data::IsLandscapeOrientation() ? 1 : 0;
+
+    main_pane.LayoutRect(application_window.Rect(),
+            AknLayoutScalable_Apps::main_pane(orientation + 10).LayoutLine());
+
+    aRect.SetWidth(main_pane.Rect().Width());
+    aRect.SetHeight(main_pane.Rect().Height());     
         
     TRACE_EXIT_POINT;
     return aRect;

--- a/calendarui/views/src/calencontainerlayoutmanager.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/views/src/calencontainerlayoutmanager.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -144,12 +144,8 @@
     // See if preview pane is available
     CheckPreviewL();
 
-    // If no preview pane, check for an info bar
-    if ( !iLayoutFlags.IsSet( ECalenContainerPreview ))
-        {
-        CheckInfobarL();
-        }
-
+    CheckInfobarL();
+    
     TRACE_EXIT_POINT;
     }
 
@@ -163,10 +159,9 @@
     TRACE_ENTRY_POINT;
 
     TRect previewRect = iContainer.PreviewRectL();
-    if ( !iContainer.PreviewRectL().IsEmpty() )
+    if (!iContainer.PreviewRectL().IsEmpty() && iContainer.PreviewPane())
         {
-        iLayoutFlags.Set( ECalenContainerPreview );
-        iLayoutFlags.Clear( ECalenContainerInfobar );
+        iLayoutFlags.Set( ECalenContainerPreview );        
         }
     
     
@@ -200,8 +195,7 @@
             {
             iInfobar = infoBarControl;
             // If the infobar exists, set the container window and activate.
-            iLayoutFlags.Set( ECalenContainerInfobar );
-            iLayoutFlags.Clear( ECalenContainerPreview );
+            iLayoutFlags.Set( ECalenContainerInfobar );           
             iInfobar->SetContainerWindowL( iContainer );
             }
        }

--- a/calendarui/views/src/calendaycontainer.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/views/src/calendaycontainer.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -1438,24 +1438,25 @@
         return;
         }
         
-    if(aPointerEvent.iType == TPointerEvent::EButton1Up)
+    if(aPointerEvent.iType == TPointerEvent::EButton1Down)
         {
         control = iLayoutManager->ControlOrNull();
         if(control)
             {
             if(control->Rect().Contains(aPointerEvent.iPosition))
                 {
-                control->HandlePointerEventL(aPointerEvent);		        		
+                control->HandlePointerEventL(aPointerEvent);	
+                return;
                 }
             }
+        if (iListBox->Model()->NumberOfItems() <= 0)
+            {
+            iView->HandleCommandL(ECalenCmdOpenMskDialog);
+            return;
+            }
         }
 	        	
-    TInt pointerIndex(-1);
-    if(iListBox->Model()->NumberOfItems() <= 0)
-        {   
-        iView->HandleCommandL(ECalenCmdOpenMskDialog);
-        return;
-        }
+    TInt pointerIndex(-1);    
      // Single click integration
     if ( aPointerEvent.iType == TPointerEvent::EButton1Down
             && iListBox->View()->XYPosToItemIndex(

--- a/calendarui/views/src/calenmonthcontainer.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/views/src/calenmonthcontainer.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -116,12 +116,7 @@
 
     delete iGrid;
     delete iMonthDataArray;
-    delete iBackgroundSkinContext;
-    if( iNativePreview && iPreview )
-        {
-        delete iPreview;
-        iPreview = NULL;
-        }
+    delete iBackgroundSkinContext;    
 
     TRACE_EXIT_POINT;
     }
@@ -510,7 +505,7 @@
     SetActiveDayL( aNewActiveDay );
 
     // dont focus the preview popup/previewpane if any dialog or faster app is active
-    if( !iView->IsEditorActiveOrFasterAppExit())
+    if( iPreview && !iView->IsEditorActiveOrFasterAppExit())
     	{
     	iPreview->FocusChangedL( aNewActiveDay );
     	}
@@ -619,7 +614,7 @@
     {
     TRACE_ENTRY_POINT;
 
-    if (aType == EEventKeyDown)
+    if (iPreview && aType == EEventKeyDown) 
         {
         iPreview->Hide();
         }
@@ -1035,6 +1030,16 @@
     }
 
 // ----------------------------------------------------------------------------
+// CCalenMonthContainer::PreviewPane
+// Returns previewpane pointer
+// ----------------------------------------------------------------------------  
+const MCalenPreview* CCalenMonthContainer::PreviewPane()
+    {
+    TRACE_ENTRY_POINT
+    TRACE_EXIT_POINT
+    return iPreview;
+    }
+	
 // CCalenMonthContainer::ConstructImplL
 // Third phase constructor.
 // This function was called CCalenNativeView::ConstructL().
@@ -1055,12 +1060,7 @@
     // Create preview pane
     TRect aRect = PreviewRectL();
     iPreview = iServices.CustomPreviewPaneL(aRect);
-    if (iPreview == NULL) 
-		{
-		iPreview = CCalenPreview::NewL( iView, locale, iServices );
-		iNativePreview = ETrue;
-		}
-     
+    
     // grid
     iGrid = new(ELeave) CCalenMonthGrid(iFirstDayOfGrid,this);
     iGrid->SetContainerWindowL(*this);
@@ -1658,6 +1658,19 @@
 
     if(AknLayoutUtils::PenEnabled())
         {
+        CCoeControl* control( NULL );
+        if(aPointerEvent.iType == TPointerEvent::EButton1Down)
+            {
+            control = iLayoutManager->ControlOrNull();
+            if(control)
+                {
+                if(control->Rect().Contains(aPointerEvent.iPosition))
+                    {
+                    control->HandlePointerEventL(aPointerEvent); 
+                    return;
+                    }
+                }
+            }
         TInt pointerIndex(-1);
         TBool isItem (iGrid->View()->XYPosToItemIndex(aPointerEvent.iPosition, pointerIndex));
         CAknGridM* gridModel = static_cast<CAknGridM*>(iGrid->Model());
@@ -1732,7 +1745,10 @@
                 if ( aPointerEvent.iType == TPointerEvent::EButton1Down )
                     {
                     iGrid->HandlePointerEventL( pointerEvent );
-                    iPreview->Hide();
+                    if (iPreview)
+                        {
+                        iPreview->Hide();
+                        }
                     if ( pointerIndex != index )
                         {
                         iChangeMonth = EFalse;
@@ -1779,7 +1795,7 @@
     {
     switch ( aEventType )
         {
-        case ( MEikListBoxObserver::EEventItemDoubleClicked ):
+        case ( MEikListBoxObserver::EEventItemClicked ): 
             {
             if ( !iView->MenuBar()->IsDisplayed() )
                 {
@@ -1791,13 +1807,16 @@
     }
 
 
-
+// ----------------------------------------------------------------------------
+// CCalenMonthContainer::HidePopup
+// ----------------------------------------------------------------------------
 void CCalenMonthContainer::HidePopup()
     {
     TRACE_ENTRY_POINT;
-    
-    iPreview->Hide();
-    
+    if (iPreview)
+        {
+        iPreview->Hide();
+        }
     TRACE_EXIT_POINT;
     }
 
@@ -2131,7 +2150,7 @@
 		iView->SetEditorActive( EFalse );
 		
     // dont focus the preview popup/previewpane if any dialog or faster app is active
-    if(!iView->IsEditorActiveOrFasterAppExit())
+    if(iPreview && !iView->IsEditorActiveOrFasterAppExit())
        {
        // preview popup is shown when application comes to foreground
        iPreview->FocusChangedL( iServices.Context().FocusDateAndTimeL().TimeLocalL() );

--- a/calendarui/views/src/calentodoview.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/views/src/calentodoview.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -323,6 +323,7 @@
         //TODO: will be uncommented with copy to cal functionality.   
         case ECalenCopyToCalendars:
             {
+            SaveCurrentItemIndexL();
             CopyToCalendarsL();
             }
             break;

--- a/calendarui/views/src/calenweekcontainer.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/views/src/calenweekcontainer.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -211,11 +211,7 @@
     TRACE_ENTRY_POINT;
 
     delete iListBox;
-    if( iNativePreview && iPreview )
-        {
-        delete iPreview;
-        iPreview = NULL;
-        }
+    
     delete iDesArray;
 
     CleanupInstances();
@@ -1242,11 +1238,7 @@
     // Create preview pane
     TRect aRect = PreviewRectL();
     iPreview = iServices.CustomPreviewPaneL(aRect);
-    if (iPreview == NULL) 
-		{
-		iPreview = CCalenPreview::NewL( iView, locale, iServices );
-		iNativePreview = ETrue;
-		}    
+    
     // ownership of builder transferred
 
     // 3) Listbox
@@ -1361,7 +1353,7 @@
                                             AknLayoutScalable_Apps::listscroll_cale_week_pane(layoutToolBarVariant).LayoutLine() );
                                             
 
-    TWeekListBoxLayout lay( UseInfobar(), UseToolbar(), ETrue, main_pane );
+    TWeekListBoxLayout lay( UseInfobar(), UseToolbar(), UsePreview(), main_pane ); 
 
     iListBox->SetRect( iListBox->LayoutRect() );
     TInt layoutVariant = lay.LayoutVariantIndex(TWeekListBoxLayout::EScrollPaneCp08);
@@ -1545,7 +1537,7 @@
     TRACE_ENTRY_POINT;
 
     // always hide popup on key events
-    if (aType == EEventKeyDown)
+    if (iPreview && aType == EEventKeyDown)
         {
         iPreview->Hide();
         }
@@ -1766,7 +1758,7 @@
         CCalHourItem& itemInfo = *(*slotTable)[iListBox->CurrentItemIndex()];
         
         // dont focus the preview popup/previewpane if any dialog or faster app is active        
-		if(!iView->IsEditorActiveOrFasterAppExit())
+		if(iPreview && !iView->IsEditorActiveOrFasterAppExit())
 			{
 	        if( !itemInfo.IsTimed() )
 	            { 
@@ -2182,6 +2174,18 @@
             aPointerEvent.iType == TPointerEvent::EButton1Down )
             {
             IgnoreEventsUntilNextPointerUp();
+            CCoeControl* control(NULL);
+            if (aPointerEvent.iType == TPointerEvent::EButton1Down)
+                {
+                control = iLayoutManager->ControlOrNull();
+                if (control)
+                    {
+                    if (control->Rect().Contains(aPointerEvent.iPosition))
+                        {
+                        control->HandlePointerEventL(aPointerEvent);
+                        }
+                    }
+                }
             return;
             }
         
@@ -2204,10 +2208,7 @@
                             {
                             UpdateStatusPaneAndExtensionsL();
                             }
-                        iFirstTap = ETrue;
                         }
-                    else
-                        iFirstTap = EFalse;
                     }
                 else
                     {
@@ -2235,13 +2236,12 @@
                     if (newColumn != oldColumn)
                         {
                         WeekView().SetStatusPaneFromActiveContextL();
-                        }
-                    iFirstTap = ETrue;
+                        }                    
                     }
                 break;
                 }
             case TPointerEvent::EButton1Up:
-                if(isItem && iFirstTap == EFalse &&
+                if(isItem &&
                    iView->MenuBar()->IsDisplayed() == EFalse)
                     {
                     iServices.IssueCommandL( ECalenForwardsToDayView );
@@ -2267,9 +2267,10 @@
 void CCalenWeekContainer::HidePopup()
     {
     TRACE_ENTRY_POINT;
-    
-    iPreview->Hide();    
-    
+    if (iPreview)
+        {
+        iPreview->Hide();
+        }
     TRACE_EXIT_POINT;
     }
 
@@ -2285,8 +2286,10 @@
     SizeChanged();
     iViewPopulationComplete = EFalse;
     
-    iPreview->Hide();
-        
+    if (iPreview)
+        {
+        iPreview->Hide();
+        }
     iListBox->View()->SetDisableRedraw( ETrue );
     PopulatesDayListsL();
 
@@ -2465,6 +2468,18 @@
 	
     return row;	
 	}
+	
+// -----------------------------------------------------------------------------
+// CCalenWeekContainer::PreviewPane
+// Return preview pane pointer
+// -----------------------------------------------------------------------------
+//	
+const MCalenPreview* CCalenWeekContainer::PreviewPane()
+    {
+    TRACE_ENTRY_POINT
+    TRACE_EXIT_POINT
+    return iPreview;
+    }	
 
 // ----------------------------------------------------------------------------
 // CCalenWeekContainer::UpdatePreviewPaneL
@@ -2482,7 +2497,7 @@
         CCalHourItem& itemInfo = *(*slotTable)[iListBox->CurrentItemIndex()];
         
         // dont focus the preview popup/previewpane if any dialog or faster app is active
-        if(!iView->IsEditorActiveOrFasterAppExit())
+        if( iPreview && !iView->IsEditorActiveOrFasterAppExit())
             {
             if( !itemInfo.IsTimed() )
                 { 

--- a/clock2/clockui/uilayer/clockalarmeditor/src/clockalarmeditorimpl.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/clock2/clockui/uilayer/clockalarmeditor/src/clockalarmeditorimpl.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -547,7 +547,9 @@
     // Execute the following commands if the resource belongs to alarmeditor.
     // Display the menu items based on the current focused control.
     if( ( EControlTextEditor == iSelectedControl ) ||
-        ( EControlTimeEditor == iSelectedControl ) )
+        ( EControlTimeEditor == iSelectedControl ) ||
+        ( EControlOccurancePopup == iSelectedControl ) ||
+        ( EControlAlarmDayPopup == iSelectedControl ) )
         {
         aMenuPane->SetItemDimmed( EClockAlarmChange, ETrue );
         }

Binary file clock2/conf/clockapp.confml has changed

--- a/notepad/notepad1/LibData/NpdLib.rss	Fri Feb 19 22:49:53 2010 +0200
+++ b/notepad/notepad1/LibData/NpdLib.rss	Fri Mar 12 15:42:35 2010 +0200
@@ -1524,19 +1524,23 @@
     {
     buf = qtn_nmake_no_memos_secondary_text;    
     }
+// -----------------------------------------------------------------------------
+//
+// r_send_notepad_note
+// the resource process dialog when send notes via message and bluetooth
+//
+// -----------------------------------------------------------------------------
+//
 RESOURCE DIALOG r_send_notepad_note
     {
-    flags = EAknWaitNoteFlags | EEikDialogFlagModeless;
-//    buttons=R_AVKON_SOFTKEYS_EMPTY;
-	buttons=R_AVKON_SOFTKEYS_CANCEL;
+    flags = EAknWaitNoteFlags;
+    buttons=R_AVKON_SOFTKEYS_CANCEL;
     items=
         {
         DLG_LINE
             {
             type = EAknCtNote;
-            
-	//id = EGeneralNote;
-	  id      = ESendNotepadAttach;
+            id = ESendNotepadAttach;
             control= AVKON_NOTE
                 {
                 layout = EWaitLayout;

Binary file organizer_plat/calendar_common_utils_api/tsrc/group/rndcert.der has changed

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/organizer_plat/calendar_common_utils_api/tsrc/group/rndcert.key	Fri Mar 12 15:42:35 2010 +0200
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQC/TDP7KKIaf5+uW4OD2iVZuUMC2a+SeQTjf6srlKcOm+CpPNXn
+uLNm/8fdEnyOIuRXPRKmqhs1n0JkxEGHynELWMTuKXbQx9SRAGUXzyneGn+IJNnO
+vOKHWgKCouX2hfI8rtkdqJpqmO460gGsMgw+lsbeyWyW9lnfLxq+ZC7sqQIDAQAB
+AoGBALmUWZE8GBaQ3P4u9WUCSd3DJkkrmXIFSULSZeH/chlwCwDjbbhArHothVzo
+REE3hEFFlERvHbplZ+mNouzy7boduvgUzbksGrbGMLJ2qO1GzWWVwV+GzOWKd3ss
+/98Gwoy5R8pjnkqUE2wP1iJFw0FjvUTKcYv/z6t3LLJ0CsoBAkEA+c7ixvsviQ3J
+s0INytCKU2bf8fqFQJi1VI82ukxNsujGTQ9upVSjuvqPvWyDvvTdrUBHqO+3qPut
+sEh01Q8aiQJBAMQKDJPVRu4ud3mwUfEavzL5EjqwG1k9VCNGYsT4FwtrHcxu1oP/
+pk6M3rIZukqomoEEnHWPMwhrK3fhBqi0OSECQQDr40VXege4FnH5OI2Hj4afHMyp
+VdQQXGMWFyopnzXblFz0lXb43cTCIiorR9XcMqNFHybLypkWE5o+lRzlt55pAkBQ
+P/zeF5Sts//cpL0mgdh7OVKpC6ZmZaCnwAx2rUhhuDu+kDDoYCLoTOps5fNI1LRK
+1GRoC3LMo3Jr5IYhUYWBAkBpCpN6k4JU/mszq98EojHerQNxk8sPqvQKUzTutohT
+1gLX9yepGayB/TtT2EEJDkWOlnTy/dvN6W3vzbJYz97x
+-----END RSA PRIVATE KEY-----

--- a/organizer_plat/calendar_custamization_api/inc/calennotificationhandler.h	Fri Feb 19 22:49:53 2010 +0200
+++ b/organizer_plat/calendar_custamization_api/inc/calennotificationhandler.h	Fri Mar 12 15:42:35 2010 +0200
@@ -77,6 +77,7 @@
 	ECalenNotifyCalendarInfoCreated,
 	ECalenNotifyCalendarInfoUpdated,
 	ECalenNotifyCalendarFileDeleted,
+	ECalenNotifyEntrySendCancel,
     ECalenNotifyUserDefined1,
     ECalenNotifyUserDefined2,
     ECalenNotifyUserDefined3,

--- a/organizer_plat/calendar_settings_keys_api/inc/CalendarInternalCRKeys.h	Fri Feb 19 22:49:53 2010 +0200
+++ b/organizer_plat/calendar_settings_keys_api/inc/CalendarInternalCRKeys.h	Fri Mar 12 15:42:35 2010 +0200
@@ -123,26 +123,21 @@
 **/
 const TUint32 KCalendarStartupStatus = 0x0000000E;
 
-/**
-* Text string containing default calendar names separated by commas
-* Used for creating default calendars at the startup of the device
-* Default value: "Personal,Family,Friends"
-*/
-const TUint32 KCalendarDefaultCalendars = 0x0000000F;
+
 
 /**
 * Text string containing default calendar colors separated by commas
 * Used for creating default calendars at the startup of the device
 * Default value: "16711680,65280,255"
 */
-const TUint32 KCalendarDefaultColors = 0x00000010;
+const TUint32 KCalendarDefaultColors = 0x0000000F;
 
 /**
 * String value containing unique calendar value 
 * Used for identifying an entry by LUID + unique calendar value 
 * Default value:"0"
 */
-const TUint32 KCalendarAvailableValue = 0x00000011;
+const TUint32 KCalendarAvailableValue = 0x00000010;
 
 
 #endif  // CALENDARINTERNALCRKEYS_H

Binary file organizer_plat/meeting_request_mailbox_utilities_api/tsrc/stiff/group/rndcert.der has changed

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/organizer_plat/meeting_request_mailbox_utilities_api/tsrc/stiff/group/rndcert.key	Fri Mar 12 15:42:35 2010 +0200
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQC/TDP7KKIaf5+uW4OD2iVZuUMC2a+SeQTjf6srlKcOm+CpPNXn
+uLNm/8fdEnyOIuRXPRKmqhs1n0JkxEGHynELWMTuKXbQx9SRAGUXzyneGn+IJNnO
+vOKHWgKCouX2hfI8rtkdqJpqmO460gGsMgw+lsbeyWyW9lnfLxq+ZC7sqQIDAQAB
+AoGBALmUWZE8GBaQ3P4u9WUCSd3DJkkrmXIFSULSZeH/chlwCwDjbbhArHothVzo
+REE3hEFFlERvHbplZ+mNouzy7boduvgUzbksGrbGMLJ2qO1GzWWVwV+GzOWKd3ss
+/98Gwoy5R8pjnkqUE2wP1iJFw0FjvUTKcYv/z6t3LLJ0CsoBAkEA+c7ixvsviQ3J
+s0INytCKU2bf8fqFQJi1VI82ukxNsujGTQ9upVSjuvqPvWyDvvTdrUBHqO+3qPut
+sEh01Q8aiQJBAMQKDJPVRu4ud3mwUfEavzL5EjqwG1k9VCNGYsT4FwtrHcxu1oP/
+pk6M3rIZukqomoEEnHWPMwhrK3fhBqi0OSECQQDr40VXege4FnH5OI2Hj4afHMyp
+VdQQXGMWFyopnzXblFz0lXb43cTCIiorR9XcMqNFHybLypkWE5o+lRzlt55pAkBQ
+P/zeF5Sts//cpL0mgdh7OVKpC6ZmZaCnwAx2rUhhuDu+kDDoYCLoTOps5fNI1LRK
+1GRoC3LMo3Jr5IYhUYWBAkBpCpN6k4JU/mszq98EojHerQNxk8sPqvQKUzTutohT
+1gLX9yepGayB/TtT2EEJDkWOlnTy/dvN6W3vzbJYz97x
+-----END RSA PRIVATE KEY-----

--- a/pimappservices/calendar/bwins/caltestlibu.def	Fri Feb 19 22:49:53 2010 +0200
+++ b/pimappservices/calendar/bwins/caltestlibu.def	Fri Mar 12 15:42:35 2010 +0200
@@ -45,4 +45,5 @@
 	?RegisterCalFileL@CCalTestLibrary@@QAEXABVTDesC16@@@Z @ 44 NONAME ; void CCalTestLibrary::RegisterCalFileL(class TDesC16 const &)
 	?WaitForAgendaServerClose@CCalTestLibrary@@SAXXZ @ 45 NONAME ; void CCalTestLibrary::WaitForAgendaServerClose(void)
 	?WaitForAlarmEvent@CCalTestLibrary@@QAEHHW4TAlarmChangeEvent@@W4TAlarmState@@H@Z @ 46 NONAME ; int CCalTestLibrary::WaitForAlarmEvent(int, enum TAlarmChangeEvent, enum TAlarmState, int)
+	?CreateCalSubSessionL@CCalTestLibrary@@QAEAAV?$RPointerArray@VCCalSession@@@@ABVTDesC16@@@Z @ 47 NONAME ; class RPointerArray<class CCalSession> & CCalTestLibrary::CreateCalSubSessionL(class TDesC16 const &)
 

--- a/pimappservices/calendar/client/src/calattachment.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/pimappservices/calendar/client/src/calattachment.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -554,12 +554,23 @@
 */
 EXPORT_C void CCalAttachmentFile::FetchFileHandleL(RFile& aFileHandle) const
 	{
-	if (iAttachmentImpl->IsFileHandleSet() || ! iCalSessionImpl)
-		{
-		User::Leave(KErrArgument);
-		}
-
-	iCalSessionImpl->Server().FetchFileHandleL(aFileHandle, iAttachmentImpl->Uid(), iCalSessionImpl->FileId());
+    if ( iAttachmentImpl->IsFileHandleSet() )
+        {
+        aFileHandle.Close();
+        User::LeaveIfError(
+                aFileHandle.Duplicate( iAttachmentImpl->FileHandle() ) );
+        }
+    else if ( iCalSessionImpl )
+        {
+        iCalSessionImpl->Server().FetchFileHandleL(
+                aFileHandle, 
+                iAttachmentImpl->Uid(), 
+                iCalSessionImpl->FileId() );            
+        }
+    else
+        {
+        User::Leave( KErrArgument );
+        }
 	}
 
 /** Load the binary data into the attachment object to be accessed through the CCalAttachment::Value function.

--- a/pimappservices/calendar/client/src/calcalendarinfoimpl.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/pimappservices/calendar/client/src/calcalendarinfoimpl.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -69,9 +69,9 @@
         {
         if (iProperties[position]->Value().Compare(KNullDesC8) == 0)
             {
-            __ASSERT_DEBUG(iProperties[position]->StreamId() != KNullStreamId, CalUtils::Panic(ECalendarInfoNullStreamId));
+            __ASSERT_DEBUG(iFileName && iProperties[position]->StreamId() != KNullStreamId, CalUtils::Panic(ECalendarInfoNullStreamId));
             // Get the property
-            HBufC8* value = iSessionImpl->Server().GetPropertyValueL(iSessionImpl->FileName(), iProperties[position]->StreamId());
+            HBufC8* value = iSessionImpl->Server().GetPropertyValueL(iFileName->Des(), iProperties[position]->StreamId());
             iProperties[position]->SetValue(value);
             }
         else if (iProperties[position]->State() == CAgnCalendarInfoProperty::EDeleted)

--- a/pimappservices/calendar/eabi/caltestlibu.def	Fri Feb 19 22:49:53 2010 +0200
+++ b/pimappservices/calendar/eabi/caltestlibu.def	Fri Mar 12 15:42:35 2010 +0200
@@ -52,4 +52,5 @@
 	_ZTV15CCalTestLibrary @ 51 NONAME
 	_ZN15CCalTestLibrary24WaitForAgendaServerCloseEv @ 52 NONAME
 	_ZN15CCalTestLibrary17WaitForAlarmEventEi17TAlarmChangeEvent11TAlarmStatei @ 53 NONAME
+	_ZN15CCalTestLibrary20CreateCalSubSessionLERK7TDesC16 @ 54 NONAME
 

--- a/pimappservices/calendar/server/inc/agsentrymodel.h	Fri Feb 19 22:49:53 2010 +0200
+++ b/pimappservices/calendar/server/inc/agsentrymodel.h	Fri Mar 12 15:42:35 2010 +0200
@@ -212,6 +212,7 @@
 	TTime TzRulesLastModifiedDateL();
 	void CheckTzDbModificationL();
 	void HandleTzRulesChangeL(const TTime& aTime);
+	TBool IsIndexFileAvailableL();
 
 // Calendar file conversion operations
 	void LoadNewStreamStoreL(CStreamStore& aStore, const TStreamId& aModelStreamId, CAgnEntryManager& aEntryManager, CAgnTzRuleIndex& aTzRuleIndex);
@@ -229,7 +230,7 @@
 	TBool GenerateIndexFileName(TFileName& aFileName);
 	TCalCollectionId CollectionId() const;
 	const CAgnServFile& AgnServFile();
-
+	void ResetDeleteRollbackArray();
 
 private:
 	void ConstructL(CAgnServFile* aAgnServerFile);

--- a/pimappservices/calendar/server/src/agsasyncdelete.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/pimappservices/calendar/server/src/agsasyncdelete.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -246,7 +246,7 @@
 				CleanupStack::PopAndDestroy(entry);
 				}
 			}
-			
+		iModel.ResetDeleteRollbackArray();
 		iTidyDeleteArray->Reset();
 		iModel.FlushL();
 		}

--- a/pimappservices/calendar/server/src/agsentrymodel.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/pimappservices/calendar/server/src/agsentrymodel.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -120,6 +120,14 @@
 	return *iAgnServerFile;
 	}
 
+/**
+ * Resets delete rollback array before the callback
+ */	
+void CAgnEntryModel::ResetDeleteRollbackArray()
+	{
+	iDeleteRollbackArray.ResetAndDestroy();
+	}
+
 /** Load up the stream network
  */
 void CAgnEntryModel::DoOpenL(const TStreamId& aModelStreamId)
@@ -1398,22 +1406,20 @@
 // file needs to be rebuilt and to no try to delete the file more than once.
 void CAgnEntryModel::MarkIndexFileAsDirtyL()
 	{
-	if (iIndexFileIsDirty)
-		{
-		return; // the file is already marked as dirty
-		}
-		
-	TFileName idxfilename;
-	if (!GenerateIndexFileName(idxfilename))
-		{
-		User::Leave(KErrBadName);
-		}
-	
-	TInt connectErr = iFs.Connect();
-	User::LeaveIfError(connectErr);
-	
-	iFs.Delete(idxfilename); // ignore return as there is nothing we can do with it
-	
+
+    if(IsIndexFileAvailableL())
+        {		
+            TFileName idxfilename;
+            if (!GenerateIndexFileName(idxfilename))
+                {
+                User::Leave(KErrBadName);
+                }
+            
+            TInt connectErr = iFs.Connect();
+            User::LeaveIfError(connectErr);
+            
+            iFs.Delete(idxfilename); // ignore return as there is nothing we can do with it
+        }        
 	iIndexFileIsDirty = ETrue;
 	}
 	
@@ -1512,6 +1518,32 @@
 	return EFalse;
 	}
 
+// This method check the index file is exist.
+// It returns:
+//      ETrue - File is already exist
+//      EFalse - File is not available
+TBool CAgnEntryModel::IsIndexFileAvailableL()
+    {
+    TFileName idxfilename;
+    if (!GenerateIndexFileName(idxfilename))
+        {
+        User::Leave(KErrBadName);
+        }
+    
+    TInt connectErr = iFs.Connect();
+    User::LeaveIfError(connectErr);
+    
+    RFile idxFile;
+    TInt errReadIdx = idxFile.Open(iFs, idxfilename, EFileRead);
+    CleanupClosePushL(idxFile);
+    if((errReadIdx == KErrNotFound))
+        {
+            CleanupStack::PopAndDestroy();
+            return EFalse;
+        }
+    CleanupStack::PopAndDestroy(&idxFile);
+    return ETrue;
+}
 
 // This method attempts to save all indices to the index file.
 // If any errors are encountered it will Leave.

--- a/pimappservices/calendar/server/src/agsfilemanager.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/pimappservices/calendar/server/src/agsfilemanager.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -1243,7 +1243,7 @@
         }
     else
         {
-        iAgnServer.AlarmServer().SetAlarmStatusForCalendarFile(fileName, EAlarmStatusEnabled); 
+        QueueAlarmsImmediately();
         }
     
     User::LeaveIfError(iStore->Commit());

--- a/pimappservices/calendar/server/src/agsmain.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/pimappservices/calendar/server/src/agsmain.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -260,6 +260,7 @@
 	iProxy = CAgnTlsProxy::CreateL(CAgnTlsProxy::TAgnTlsTzRulesType_Server);
 			
 	User::LeaveIfError(iFs.Connect());
+	User::LeaveIfError( iFs.ShareProtected() );
 	User::LeaveIfError(iAlarmServer.Connect());
 	iFileMgr = CAgnServFileMgr::NewL(iFs, *this);
 	iFileMgr->CreatePermanentDataL();

--- a/pimappservices/calendar/shared/src/agmcalendartime.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/pimappservices/calendar/shared/src/agmcalendartime.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -101,6 +101,14 @@
 			iTime = AgnDateTime::MaxDate();
 			}
  		iLocalOffsetInMinutes = KOffsetUnspecified;
+ 		if ( ! aFloating)
+            { 
+            SetFloatingFlag(EFalse);
+            }
+ 		else
+            {
+            SetFloatingFlag(ETrue);
+            }
 		}
 	else
 		{

--- a/pimappservices/calendar/tsrc/Integration/TestCalApiPolicing/generated/BLD.INF	Fri Feb 19 22:49:53 2010 +0200
+++ b/pimappservices/calendar/tsrc/Integration/TestCalApiPolicing/generated/BLD.INF	Fri Mar 12 15:42:35 2010 +0200
@@ -21,11 +21,11 @@
 
 PRJ_TESTEXPORTS
 
-TestCalApiPolicing.bat \epoc32\tools\TestCalApiPolicing.bat
-Cap_80000004_TestCalApiPolicingSub.script C:\testdata\scripts\Cap_80000004_TestCalApiPolicingSub.script
-Cap_00010004_TestCalApiPolicingSub.script C:\testdata\scripts\Cap_00010004_TestCalApiPolicingSub.script
-Cap_00008004_TestCalApiPolicingSub.script C:\testdata\scripts\Cap_00008004_TestCalApiPolicingSub.script
-Cap_00000004_TestCalApiPolicingSub.script C:\testdata\scripts\Cap_00000004_TestCalApiPolicingSub.script
-TestCalApiPolicing.IBY \epoc32\rom\include\TestCalApiPolicing.IBY
-TestCalApiPolicing.script C:\testdata\scripts\TestCalApiPolicing.script
+TestCalApiPolicing.bat /epoc32/tools/TestCalApiPolicing.bat
+Cap_80000004_TestCalApiPolicingSub.script C:/testdata/scripts/Cap_80000004_TestCalApiPolicingSub.script
+Cap_00010004_TestCalApiPolicingSub.script C:/testdata/scripts/Cap_00010004_TestCalApiPolicingSub.script
+Cap_00008004_TestCalApiPolicingSub.script C:/testdata/scripts/Cap_00008004_TestCalApiPolicingSub.script
+Cap_00000004_TestCalApiPolicingSub.script C:/testdata/scripts/Cap_00000004_TestCalApiPolicingSub.script
+TestCalApiPolicing.IBY /epoc32/rom/include/TestCalApiPolicing.IBY
+TestCalApiPolicing.script C:/testdata/scripts/TestCalApiPolicing.script
 

--- a/pimappservices/calendar/tsrc/Integration/TestCalApiPolicing/generated/TestCalApiPolicing.MMP	Fri Feb 19 22:49:53 2010 +0200
+++ b/pimappservices/calendar/tsrc/Integration/TestCalApiPolicing/generated/TestCalApiPolicing.MMP	Fri Mar 12 15:42:35 2010 +0200
@@ -82,9 +82,9 @@
 SOURCE        EDeleteEntryByGuid1_CSTEP.CPP
 SOURCE        ECommit1_CSTEP.CPP
 SOURCE        ERollback1_CSTEP.CPP
-USERINCLUDE   ..\..\..\..\shared\inc
+USERINCLUDE   ../../../../shared/inc
 
-SYSTEMINCLUDE \epoc32\include \epoc32\include\test
+SYSTEMINCLUDE /epoc32/include /epoc32/include/test
 LIBRARY       euser.lib 
 
 //For TEF 

--- a/pimappservices/calendar/tsrc/Integration/TestCalApiPolicing/template/TestCalApiPolicing.MMP	Fri Feb 19 22:49:53 2010 +0200
+++ b/pimappservices/calendar/tsrc/Integration/TestCalApiPolicing/template/TestCalApiPolicing.MMP	Fri Mar 12 15:42:35 2010 +0200
@@ -24,7 +24,7 @@
 PARAM_FOREACH_MESS_END
 USERINCLUDE   PARAM_SVR_USERINCLUDE
 
-SYSTEMINCLUDE PARAM_SVR_SYSTEMINCLUDE \epoc32\include\test
+SYSTEMINCLUDE PARAM_SVR_SYSTEMINCLUDE /epoc32/include/test
 LIBRARY       PARAM_SVR_LIBRARIES
 
 //For TEF 

--- a/pimappservices/calendar/tsrc/caltestlib.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/pimappservices/calendar/tsrc/caltestlib.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -21,6 +21,7 @@
 #include <caldataexchange.h>
 #include <caldataformat.h>
 #include <calsession.h>
+#include <calcalendarinfo.h>
 #include <calprogresscallback.h>
 #include <e32test.h>
 #include <consolealarmalertservermain.h>
@@ -120,6 +121,7 @@
 void CCalTestLibrary::CloseCalendarSession(TBool aWaitForAgendaToClose)
 	{
 	iChunkMutex.Wait();
+	iSubCalSessions.ResetAndDestroy();
 	delete iSession;
 	iSession = NULL;	
 	if (iRefCount && (--*iRefCount <= 0) && aWaitForAgendaToClose)
@@ -399,6 +401,16 @@
 	
 	if (aIsCalFile)
 		{
+		
+		for(TInt i = 0; i < iSubCalSessions.Count();i++)
+		    {
+		    CCalCalendarInfo* info = iSubCalSessions[i]->CalendarInfoL();
+		    HBufC* fileName = info->FileNameL().AllocLC();
+		    delete info;
+		    iSubCalSessions[i]->DeleteCalFileL(*fileName);
+		    CleanupStack::PopAndDestroy(fileName);
+		    }
+		
 		iSession->DeleteCalFileL(aFileName);
 		TInt indx=-1;
 		if(iDelFileFlag)
@@ -948,4 +960,24 @@
 	return tickPeriod * durationInTicks;	
 	}
 
+EXPORT_C RPointerArray<CCalSession>& CCalTestLibrary::CreateCalSubSessionL(const TDesC& aFileName)
+    {
+    CCalSession* session = CCalSession::NewL(*iSession);
+    CCalCalendarInfo* calendarInfo = CCalCalendarInfo::NewL();
+    calendarInfo->SetColor(KRgbRed);
+    calendarInfo->SetNameL(_L("test"));
+    calendarInfo->SetEnabled(ETrue);
+    
+    TRAPD(err,session->CreateCalFileL(aFileName,*calendarInfo));
+    if(err == KErrAlreadyExists)
+        {
+        session->DeleteCalFileL(aFileName);
+        session->CreateCalFileL(aFileName,*calendarInfo);
+        }
+    session->OpenL(aFileName);
+    iSubCalSessions.Append(session);
+    
+    delete calendarInfo;
+    return iSubCalSessions;
+    }
 

--- a/pimappservices/calendar/tsrc/caltestlib.h	Fri Feb 19 22:49:53 2010 +0200
+++ b/pimappservices/calendar/tsrc/caltestlib.h	Fri Mar 12 15:42:35 2010 +0200
@@ -105,6 +105,9 @@
 
 	// Used to append the file to the delete list
 	IMPORT_C void RegisterCalFileL(const TDesC& aFileName);
+	
+	// Create a calendar file. It leaves if the file exists.
+	IMPORT_C RPointerArray<CCalSession>& CreateCalSubSessionL(const TDesC& aFileName);
 
 
 // Session and Views handling
@@ -220,6 +223,7 @@
 	TBool				iDelFileFlag;
 	RMutex				iChunkMutex;
 	RASCliSession		iAlarmServer;
+	RPointerArray<CCalSession> iSubCalSessions;
 	};
 
 

--- a/pimappservices/calendar/tsrc/interop/group/alldayevents.mmp	Fri Feb 19 22:49:53 2010 +0200
+++ b/pimappservices/calendar/tsrc/interop/group/alldayevents.mmp	Fri Mar 12 15:42:35 2010 +0200
@@ -21,10 +21,10 @@
 
 CAPABILITY readuserdata writeuserdata
 
-USERINCLUDE	 ..\inc
-SYSTEMINCLUDE   \epoc32\include
+USERINCLUDE	 ../inc
+SYSTEMINCLUDE   /epoc32/include
 
-SOURCEPATH	  ..\src
+SOURCEPATH	  ../src
 SOURCE		  alldayevents.cpp
 
 LIBRARY      euser.lib estor.lib efsrv.lib pimtestclient.lib 

--- a/pimappservices/calendar/tsrc/tcal_dataexchange.mmp	Fri Feb 19 22:49:53 2010 +0200
+++ b/pimappservices/calendar/tsrc/tcal_dataexchange.mmp	Fri Mar 12 15:42:35 2010 +0200
@@ -23,6 +23,7 @@
 
 USERINCLUDE		.
 SYSTEMINCLUDE	/epoc32/include
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 LIBRARY			calinterimapi.lib
 LIBRARY			euser.lib estor.lib efsrv.lib caltestlib.lib

--- a/pimappservices/calendarvcalplugin/Inc/agnversit.h	Fri Feb 19 22:49:53 2010 +0200
+++ b/pimappservices/calendarvcalplugin/Inc/agnversit.h	Fri Mar 12 15:42:35 2010 +0200
@@ -25,10 +25,10 @@
 #include <e32std.h>
 #include <vcal.h>
 #include <tz.h>
-#include "calversit.h"
 #include <caldataexchange.h>
 
 #include "agmvcal.h"
+#include "calversit.h"
 
 class TTzRule;
 class CAgnVCalConverter;

--- a/pimappservices/calendarvcalplugin/group/agnversit.mmp	Fri Feb 19 22:49:53 2010 +0200
+++ b/pimappservices/calendarvcalplugin/group/agnversit.mmp	Fri Mar 12 15:42:35 2010 +0200
@@ -31,7 +31,7 @@
 SOURCEPATH	../src
 
 userinclude	../Inc
-USERINCLUDE     ../../calendar/inc
+userinclude ../../calendar/inc
 
 
 SOURCEPATH	../src

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pimappsupport/chinesecalendaralg/bwins/CCONORIGINALU.DEF	Fri Mar 12 15:42:35 2010 +0200
@@ -0,0 +1,19 @@
+EXPORTS
+	??0TArithmeticalDate@@QAE@XZ @ 1 NONAME ; public: __thiscall TArithmeticalDate::TArithmeticalDate(void)
+	??0TChineseCalendar@@QAE@XZ @ 2 NONAME ; public: __thiscall TChineseCalendar::TChineseCalendar(void)
+	??0TChineseDate@@QAE@XZ @ 3 NONAME ; public: __thiscall TChineseDate::TChineseDate(void)
+	??0TGregorianCalendar@@QAE@N@Z @ 4 NONAME ; public: __thiscall TGregorianCalendar::TGregorianCalendar(double)
+	??0TGregorianCalendar@@QAE@XZ @ 5 NONAME ; public: __thiscall TGregorianCalendar::TGregorianCalendar(void)
+	??4TCalendar@@QAEAAV0@ABV0@@Z @ 6 NONAME ; public: class TCalendar & __thiscall TCalendar::operator=(class TCalendar const &)
+	??8TArithmeticalDate@@QBEHABV0@@Z @ 7 NONAME ; public: int __thiscall TArithmeticalDate::operator==(class TArithmeticalDate const &)const 
+	??8TChineseDate@@QBEHABV0@@Z @ 8 NONAME ; public: int __thiscall TChineseDate::operator==(class TChineseDate const &)const 
+	?ChineseToDateTime@TChineseCalendar@@QAEXAAVTDateTime@@@Z @ 9 NONAME ; public: void __thiscall TChineseCalendar::ChineseToDateTime(class TDateTime &)
+	?DateTimeToChinese@TChineseCalendar@@QAEXABVTDateTime@@@Z @ 10 NONAME ; public: void __thiscall TChineseCalendar::DateTimeToChinese(class TDateTime const &)
+	?DateTimeToGregorian@TGregorianCalendar@@QAEXAAVTDateTime@@@Z @ 11 NONAME ; public: void __thiscall TGregorianCalendar::DateTimeToGregorian(class TDateTime &)
+	?GetDate@TChineseCalendar@@QAEXAAVTChineseDate@@@Z @ 12 NONAME ; public: void __thiscall TChineseCalendar::GetDate(class TChineseDate &)
+	?GetDate@TGregorianCalendar@@QAEXAAVTArithmeticalDate@@@Z @ 13 NONAME ; public: void __thiscall TGregorianCalendar::GetDate(class TArithmeticalDate &)
+	?GregorianToDateTime@TGregorianCalendar@@QAEXAAVTDateTime@@@Z @ 14 NONAME ; public: void __thiscall TGregorianCalendar::GregorianToDateTime(class TDateTime &)
+	?JulianDay@TCalendar@@QAENXZ @ 15 NONAME ; public: double __thiscall TCalendar::JulianDay(void)
+	?SetDate@TChineseCalendar@@QAEHABVTChineseDate@@@Z @ 16 NONAME ; public: int __thiscall TChineseCalendar::SetDate(class TChineseDate const &)
+	?SetDate@TGregorianCalendar@@QAEHAAVTArithmeticalDate@@@Z @ 17 NONAME ; public: int __thiscall TGregorianCalendar::SetDate(class TArithmeticalDate &)
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pimappsupport/chinesecalendaralg/calcontablesrc/CalconTable.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -0,0 +1,314 @@
+// Copyright (c) 2001-2009 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Creates the Calcon look-up table for the date range:
+// 1/1/StartYear & 31/12/KEndYear
+// The Linda Agenda date range is 1980-2100
+// Creates CALCONDATA.CPP and CALCONDATA.H in \epoc32\wins\c
+// These should then be placed in  \calcon\src and \calcon\inc respectively
+// and then Calcon should be rebuilt.
+// Uses the original Calcon library, now called CalconOriginal.dll
+//
+
+void mainL();
+
+#include "CalconTable.h"
+#include "calconv.h"
+#include <utf.h>
+
+// Type definitions
+#define UNUSED_VAR(a) a = a
+
+//Change these to alter the date range for Calcon
+const TInt KStartYear=-587;
+const TInt KEndYear=2100;
+
+CCalconTableEngine::CCalconTableEngine() :
+	iTest(_L("CalconTable"))
+		{}
+
+void CCalconTableEngine::GenerateTableL()
+	{
+	TTime timeStarted;
+	timeStarted.UniversalTime();
+
+	iTest.Printf(_L("Generating Calcon table for dates:\n"));
+	iTest.Printf(_L("Start: 1st January %d\n"),KStartYear);
+	iTest.Printf(_L("End: 31st December %d\n\n"),KEndYear);
+	iTest.Printf(_L("Creating c:\\calcondata.cpp\n\n"));
+
+	TDateTime dateTime(KStartYear,EJanuary,0,0,0,0,0);
+	TDateTime endTime(KEndYear,EDecember,31-1,0,0,0,0);
+
+	iStartJulianDate=JulianDate(dateTime);
+	iEndJulianDate=JulianDate(endTime);
+
+	TChineseCalendar calendar;
+
+	TInt numYears=endTime.Year()-dateTime.Year()+4;
+	iYearArray = new (ELeave) TUint[numYears];
+
+//Set date to beginning of current Chinese year
+	TChineseDate initialChineseDate;
+	calendar.DateTimeToChinese(dateTime);
+	calendar.GetDate(initialChineseDate);
+
+	initialChineseDate.iMonth=1;
+	initialChineseDate.iDay=1;
+	calendar.SetDate(initialChineseDate);
+	calendar.ChineseToDateTime(dateTime);
+
+	TTime time=dateTime;
+	TReal chineseNewYear=JulianDate(dateTime);
+
+	TChineseDate lastDate;
+	TChineseDate chineseDate=initialChineseDate;
+
+//Move near the end of the current month
+	time+=TTimeIntervalDays(27);
+	TBool hadLeapMonth=EFalse;	
+
+	iSession.Connect();
+	TInt err=iFile.Replace(iSession, _L("c:\\calcondata.cpp"), EFileShareExclusive);
+	if (err!=KErrNone)
+		return;
+
+	err=iFile2.Replace(iSession, _L("c:\\calcondata.h"), EFileShareExclusive);
+	if (err!=KErrNone)
+		return;
+
+	StartPrint(initialChineseDate.iCycle);
+
+	while (chineseNewYear<iEndJulianDate)
+		{
+		lastDate=chineseDate;
+		time+=TTimeIntervalDays(1);
+
+		dateTime=time.DateTime();
+		calendar.DateTimeToChinese(dateTime);
+		calendar.GetDate(chineseDate);
+
+		if ((chineseDate.iMonth!=lastDate.iMonth)
+			|| (chineseDate.iLeapMonth!=lastDate.iLeapMonth))
+			{
+			TInt monthFlag= lastDate.iLeapMonth ? 2 : 0;
+			ASSERT(lastDate.iDay==29 || lastDate.iDay==30);
+		
+			monthFlag += lastDate.iDay==29 ? 1 : 2;
+
+			if (lastDate.iLeapMonth)
+				hadLeapMonth=ETrue;
+
+			TInt cycle=lastDate.iCycle-initialChineseDate.iCycle;
+			TInt year=lastDate.iYear-1;
+			TInt month=lastDate.iMonth-1;//ADDED -1
+			if (hadLeapMonth)
+				month++;
+
+			if(month==0)	//was 0
+				AddNewYear((TInt)chineseNewYear);
+			
+			AddMonth(cycle,year,month,monthFlag);
+
+			if (chineseDate.iYear!=lastDate.iYear)
+				{
+				hadLeapMonth=EFalse;
+				TDateTime dt(time.DateTime());
+				chineseNewYear=(TInt)JulianDate(dt);
+				}
+
+			time+=TTimeIntervalDays(27);
+			}
+		}
+
+	StopPrint(chineseDate.iCycle);
+
+	TTime timeFinished;
+	timeFinished.UniversalTime();
+	TInt64 duration=timeFinished.Int64()-timeStarted.Int64();
+
+	Print(1,_L8("\n//Took %u seconds to create\n"),duration/1000000);
+	iFile.Close();
+	iFile2.Close();
+	iSession.Close();
+
+	delete[] iYearArray;
+	iTest.Close();
+	}
+
+TInt CCalconTableEngine::JulianDate(TDateTime& aDate)
+	{
+
+	TGregorianCalendar greg;
+	greg.DateTimeToGregorian( aDate);
+	return (TInt)greg.JulianDay();
+
+/*	An alternative method for calculating the Julian Date, used in Chinese Linda.
+//	Results differ from Calcon for -ve Gregorian years.
+
+	TInt Month = STATIC_CAST(TInt, aDate.Month());
+	TInt Year;
+	Month++;
+	
+	if (Month > 2)
+		{
+		Month = Month - 3;
+		Year = aDate.Year();
+		}
+	else
+		{
+		Month = Month + 9;
+		Year = aDate.Year() - 1;
+		}
+
+	TInt Centuries = Year / 100; 
+	TInt Decades = Year - 100 * Centuries;
+	TInt julian = (146097 * Centuries)/4 + (1461 * Decades) /4 + (153 * Month + 2) / 5 + aDate.Day() + 1 + 1721119;
+	return julian;
+*/
+	}
+
+void CCalconTableEngine::Print(TInt aFile,TPtrC8 aFormat, ...)
+	{
+	VA_LIST   args;
+	VA_START( args, aFormat);
+
+	TBuf8<1024> buffer;
+	TBuf16<1024> buffer2;
+
+	buffer.FormatList(aFormat, args);
+	CnvUtfConverter::ConvertToUnicodeFromUtf8(buffer2,buffer);
+
+	if (aFile==1)
+		iFile.Write(buffer);
+	if (aFile==2)
+		iFile2.Write(buffer);
+
+	iTest.Printf(buffer2);
+	}
+
+void CCalconTableEngine::AddNewYear(TInt aChineseNewYear)
+	{
+	iYearArray[iYearCounter++]=aChineseNewYear;
+	}
+
+void CCalconTableEngine::AddMonth(TInt aCycle, TInt aYear, TInt aMonth, TInt aMonthFlag)
+	{
+	if (iFirstPrint)
+		{
+		iFirstPrint=EFalse;
+		iFirstYear=aYear;
+
+		Print(2,_L8("const TInt KFirstJulianDate=%d;\n"),iStartJulianDate);
+		Print(2,_L8("const TInt KLastJulianDate=%d;\n"),iEndJulianDate);
+		Print(2,_L8("const TInt KFirstYear=%d; //1..60\n"),aYear+1);
+		Print(1,_L8("const TUint16 TCalconData::iCalConDataMonth[]={\n"));
+		
+		iMonthFlag=0;
+		iMonthFlagBit=1<<15;
+		iCyclePrint=aCycle;
+		iMonthPrint=aMonth;
+		iYearPrint=aYear;
+		}
+	else
+		{
+		if (aMonth==0)
+			{//print out the month details
+			Print(1,_L8(" %uU, // %u - %u\n"),iMonthFlag, iCyclePrint,iYearPrint);
+
+			iMonthFlag=0;
+			iMonthFlagBit=1<<15;
+			iCyclePrint=aCycle;
+			iMonthPrint=aMonth;
+			iYearPrint=aYear;
+			iLastYear=iYearPrint+1;
+			}
+		}
+
+	TBool bit=EFalse;	//29 days
+	if (aMonthFlag==2 || aMonthFlag==4)	//30 days
+		bit=ETrue;
+
+	if (aMonthFlag==3 || aMonthFlag==4)
+		{//set leap
+		TUint shiftedLeapMonth=TUint(aMonth+1)<<28;
+		iYearArray[iYearCounter-1]|=shiftedLeapMonth;
+		}
+	
+	if (bit)
+		iMonthFlag|=iMonthFlagBit;
+	
+	iMonthFlagBit>>=1;
+	}
+
+void CCalconTableEngine::StartPrint(TInt aFirstCycle)
+	{
+	iFirstPrint=ETrue;
+
+	Print(1,_L8("//\n"));
+	Print(1,_L8("// CALCONDATA.CPP\n"));
+	Print(1,_L8("//\n"));
+	Print(1,_L8("// Copyright (c) 2002 Symbian Ltd. All rights reserved\n"));
+	Print(1,_L8("//\n"));
+	Print(1,_L8("// Generated by CalconTable.exe\n"));
+	Print(1,_L8("//\n"));
+
+	Print(2,_L8("//\n"));
+	Print(2,_L8("// CALCONDATA.H\n"));
+	Print(2,_L8("//\n"));
+	Print(2,_L8("// Copyright (c) 2002 Symbian Ltd. All rights reserved\n"));
+	Print(2,_L8("//\n"));
+	Print(2,_L8("// Generated by CalconTable.exe\n"));
+	Print(2,_L8("//\n"));
+
+	Print(1,_L8("#include \"calconvusingtable.h\"\n"));
+	Print(2,_L8("const TInt KFirstCycle=%d;//1..n\n"),aFirstCycle);
+	}
+
+void CCalconTableEngine::StopPrint(TInt aLastCycle)
+	{
+	Print(1,_L8("};\n"));
+	Print(1,_L8("const TUint32 TCalconData::iCalConDataYear[]={\n"));
+
+	for (TInt i=0;i<iYearCounter;i++)
+		{
+		Print(1,_L8(" %u,"),iYearArray[i]);
+		Print(1,_L8(" // %d - %d\n"),(i+iFirstYear)/60, (i+iFirstYear)%60);;
+		}
+	
+	Print(1,_L8("0xffffffff\n};\n"));
+	Print(2,_L8("const TInt KLastCycle=%d;//1..n\n"),aLastCycle);
+	Print(2,_L8("const TInt KLastYear=%d;//1..60\n"),iLastYear);
+	Print(2,_L8("const TInt KNumberOfYears=%d;\n"),iYearCounter);
+	}
+
+GLDEF_C TInt E32Main()
+    {
+	__UHEAP_MARK;
+	CTrapCleanup* cleanupStack=CTrapCleanup::New();
+
+	TRAPD(error,mainL());
+	UNUSED_VAR(error); //Used to supress build warnings
+
+	delete cleanupStack;
+	__UHEAP_MARKEND;
+	return KErrNone;
+    }
+
+void mainL()
+    {
+	CCalconTableEngine* engine = new (ELeave) CCalconTableEngine();
+	CleanupStack::PushL(engine);
+	engine->GenerateTableL();
+	CleanupStack::PopAndDestroy();  //delete ConvDates;
+	}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pimappsupport/chinesecalendaralg/calcontablesrc/CalconTable.h	Fri Mar 12 15:42:35 2010 +0200
@@ -0,0 +1,55 @@
+// Copyright (c) 2001-2009 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+#ifndef __CALCONTABLE_H
+#define __CALCONTABLE_H
+
+#include <f32file.h>
+#include <e32test.h>
+
+class CCalconTableEngine : public CBase
+	{
+public:
+	CCalconTableEngine();
+	void GenerateTableL();
+private:
+	TInt JulianDate(TDateTime& aDate);
+	void AddNewYear(TInt aChineseNewYear);
+	void AddMonth(TInt aCycle, TInt aYear, TInt aMonth, TInt aMonthFlag);
+	void Print(TInt aFile, TPtrC8 aFormat, ...);
+	void StartPrint(TInt);
+	void StopPrint(TInt);
+private:
+	RTest iTest;
+	TBool iFirstPrint;
+	TInt iFirstYear;
+	TInt iLastYear;
+	TUint* iYearArray;
+	TInt iLastMonth;
+	TInt iYearCounter;
+	RFile iFile;
+	RFile iFile2;
+	RFs iSession;
+
+	TInt iCyclePrint;
+	TInt iMonthPrint;
+	TInt iYearPrint;
+	TUint iMonthFlag;
+	TUint iMonthFlagBit;
+
+	TInt iStartJulianDate;
+	TInt iEndJulianDate;
+	};
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pimappsupport/chinesecalendaralg/eabi/CConOriginalU.DEF	Fri Mar 12 15:42:35 2010 +0200
@@ -0,0 +1,28 @@
+EXPORTS
+	_ZN12TChineseDateC1Ev @ 1 NONAME
+	_ZN12TChineseDateC2Ev @ 2 NONAME
+	_ZN16TChineseCalendar17ChineseToDateTimeER9TDateTime @ 3 NONAME
+	_ZN16TChineseCalendar17DateTimeToChineseERK9TDateTime @ 4 NONAME
+	_ZN16TChineseCalendar7GetDateER12TChineseDate @ 5 NONAME
+	_ZN16TChineseCalendar7SetDateERK12TChineseDate @ 6 NONAME
+	_ZN16TChineseCalendarC1Ev @ 7 NONAME
+	_ZN16TChineseCalendarC2Ev @ 8 NONAME
+	_ZN17TArithmeticalDateC1Ev @ 9 NONAME
+	_ZN17TArithmeticalDateC2Ev @ 10 NONAME
+	_ZN18TGregorianCalendar19DateTimeToGregorianER9TDateTime @ 11 NONAME
+	_ZN18TGregorianCalendar19GregorianToDateTimeER9TDateTime @ 12 NONAME
+	_ZN18TGregorianCalendar7GetDateER17TArithmeticalDate @ 13 NONAME
+	_ZN18TGregorianCalendar7SetDateER17TArithmeticalDate @ 14 NONAME
+	_ZN18TGregorianCalendarC1Ed @ 15 NONAME
+	_ZN18TGregorianCalendarC1Ev @ 16 NONAME
+	_ZN18TGregorianCalendarC2Ed @ 17 NONAME
+	_ZN18TGregorianCalendarC2Ev @ 18 NONAME
+	_ZN9TCalendar9JulianDayEv @ 19 NONAME
+	_ZN9TCalendaraSERKS_ @ 20 NONAME
+	_ZNK12TChineseDateeqERKS_ @ 21 NONAME
+	_ZNK17TArithmeticalDateeqERKS_ @ 22 NONAME
+	_ZTI18TGregorianCalendar @ 23 NONAME ; #<TI>#
+	_ZTV18TGregorianCalendar @ 24 NONAME ; #<VT>#
+	_ZTI21TArithmeticalCalendar @ 25 NONAME ; #<TI>#
+	_ZTV21TArithmeticalCalendar @ 26 NONAME ; #<VT>#
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pimappsupport/chinesecalendaralg/group/1028702c.rss	Fri Mar 12 15:42:35 2010 +0200
@@ -0,0 +1,39 @@
+// Copyright (c) 2000-2009 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+#include "ecom/registryinfo.rh"
+
+RESOURCE REGISTRY_INFO theInfo
+	{
+	dll_uid = 0x1028702C;
+	interfaces = 
+		{
+		INTERFACE_INFO
+			{
+			interface_uid = 0x1028702B;
+			implementations = 
+				{
+				IMPLEMENTATION_INFO
+					{
+					implementation_uid = 0x1028702D;
+					version_no = 1;
+					display_name = "cconplugin";
+					default_data = "";
+					opaque_data = "";
+					}
+				};
+			}
+		};
+	}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pimappsupport/chinesecalendaralg/group/CalconTest.iby	Fri Mar 12 15:42:35 2010 +0200
@@ -0,0 +1,30 @@
+// Copyright (c) 2000-2009 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+#ifndef __CALCONTEST_IBY__
+#define __CALCONTEST_IBY__
+
+REM Calender Converter Test
+
+file=ABI_DIR\BUILD_DIR\tCCn.exe          	System\Programs\CalconTest\tCCn.exe
+#include <calcon.iby>
+
+
+
+data=EPOCROOT##epoc32\release\wins\udeb\z\calcontest\input1.txt			calcontest\input1.txt
+data=EPOCROOT##epoc32\release\wins\udeb\z\calcontest\input2.txt			calcontest\input2.txt
+data=EPOCROOT##epoc32\release\wins\udeb\z\calcontest\output1REFERENCE.txt			calcontest\output1REFERENCE.txt
+data=EPOCROOT##epoc32\release\wins\udeb\z\calcontest\output2REFERENCE.txt			calcontest\output2REFERENCE.txt
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp	Fri Mar 12 15:42:35 2010 +0200
@@ -0,0 +1,12 @@
+component	app-services_chinesecalendaralgorithm
+source	\sf\app\organizer\pimappsupport\chinesecalendaralg
+binary	\sf\app\organizer\pimappsupport\chinesecalendaralg\group	all
+exports	\sf\app\organizer\pimappsupport\chinesecalendaralg\group
+notes_source	\component_defs\release.src
+
+
+#  == IPR section auto-inserted from distribution.policy files  ==
+ipr T 
+ipr E \sf\app\organizer\pimappsupport\chinesecalendaralg\pluginsrc\table1900-2100
+
+# == end auto-inserted section ==

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pimappsupport/chinesecalendaralg/group/bld.inf	Fri Mar 12 15:42:35 2010 +0200
@@ -0,0 +1,27 @@
+// Copyright (c) 2000-2009 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Calcon BLD.INF
+// Calendar conversion utilities
+//
+
+PRJ_PLATFORMS
+
+PRJ_EXPORTS
+cconplugin.iby /epoc32/rom/include/cconplugin.iby
+
+PRJ_MMPFILES
+cconplugin.mmp
+
+#include "../test/group/bld.inf"
+