--- a/calendarui/organizerplugin/aiagendaplugin2/inc/aicalendarplugin2.h	Tue Feb 02 10:12:19 2010 +0200
+++ b/calendarui/organizerplugin/aiagendaplugin2/inc/aicalendarplugin2.h	Fri Feb 19 22:49:53 2010 +0200
@@ -21,9 +21,7 @@
 
 #include <AknsDrawUtils.h>
 #include <AknUtils.h> 
-#include <aicontentpublisher.h>
-#include <aipropertyextension.h>
-#include <aieventhandlerextension.h>
+#include <hscontentpublisher.h>
 #include "PluginDataChangeObserver.h"
 
 class CAIAgendaPluginEngineIf;
@@ -40,9 +38,7 @@
  *  @lib aicalendarplugin2
  *  @since S60 3.2
  */
-NONSHARABLE_CLASS( CAICalendarPlugin2 ): public CAiContentPublisher,
-                                         public MAiPropertyExtension,
-                                         public MAiEventHandlerExtension,
+NONSHARABLE_CLASS( CAICalendarPlugin2 ): public CHsContentPublisher,
                                          public MPluginDataChangeObserver
 {
     public:
@@ -53,30 +49,48 @@
 
         ~CAICalendarPlugin2();
 
-    // From CAiContentPublisher
+    // From CHsContentPublisher
 
-        void Resume( TAiTransitionReason aReason );
+        /**
+         * @see CHsContentPublisher
+         */
+        void Start( TStartReason aReason );
+
+        /**
+         * @see CHsContentPublisher
+         */
+        void Stop( TStopReason aReason );
 
-        void Suspend( TAiTransitionReason aReason );
+        /**
+         * @see CHsContentPublisher
+         */    
+        void Resume( TResumeReason aReason );
 
-        void Stop( TAiTransitionReason aReason );
+        /**
+         * @see CHsContentPublisher
+         */    
+        void Suspend( TSuspendReason aReason );
 
+        /**
+         * @see CHsContentPublisher
+         */    
         void SubscribeL( MAiContentObserver& aObserver );
 
+        /**
+         * @see CHsContentPublisher
+         */    
         void ConfigureL( RAiSettingsItemArray& aSettings );
 
-        TAny* Extension( TUid aUid );
-
-    // from MAiPropertyExtension
-
-        TAny* GetPropertyL( TInt aProperty );
+        /**
+         * @see CHsContentPublisher
+         */    
+        TAny* GetProperty( TProperty aProperty );
 
-        void SetPropertyL( TInt aProperty, TAny* aValue );
-
-    // from MAiEventHandlerExtension
-
+        /**
+         * @see CHsContentPublisher
+         */   
         void HandleEvent( TInt aEvent, const TDesC& aParam );
-
+        
     // From MPluginDataChangeObserver
 
         void PluginDataChanged( const RPointerArray<CCalInstance>& aEntryArray,
@@ -92,7 +106,7 @@
 
     // New methods
     
-        void DoResumeL( TAiTransitionReason aReason );
+        void DoResumeL( TResumeReason aReason );
         
         void CreateIconsL();