--- a/calendarui/organizerplugin/aiagendaplugin2/src/aicalendarplugin2constantdata.cpp	Tue Feb 02 10:12:19 2010 +0200
+++ b/calendarui/organizerplugin/aiagendaplugin2/src/aicalendarplugin2constantdata.cpp	Fri Feb 19 22:49:53 2010 +0200
@@ -22,7 +22,6 @@
 #include <StringLoader.h>
 #include <aicontentmodel.h>
 #include <aiutility.h>
-#include <aipropertyextension.h>
 #include <AknUtils.h>
 
 // CONSTANTS
@@ -136,38 +135,25 @@
     return *iNextEventOnCombined;
     }
 
-void CAICalendarPlugin2ConstantData::SetPropertyL( TInt aProperty, TAny* aValue )
-    {
-    if( aProperty == EAiPublisherInfo )
-        {
-        ASSERT( aValue );
-        
-        const TAiPublisherInfo* info( 
-                static_cast<const TAiPublisherInfo*>( aValue ) );
-                
-        iInfo = *info;
-        }        
-    }
-
-TAny* CAICalendarPlugin2ConstantData::GetPropertyL( TInt aProperty )
+TAny* CAICalendarPlugin2ConstantData::GetPropertyL( CHsContentPublisher::TProperty aProperty )
     {
-    switch( aProperty )
-    {
-    case EAiPublisherInfo:
-        return &iInfo;
-
-    case EAiPublisherContent:
+    if( aProperty == CHsContentPublisher::EPublisherContent )
+        {
         return iContent;
-
-    case EAiPublisherResources:
+        }
+    else if( aProperty == CHsContentPublisher::EPublisherResources )
+        {
         return iResources;
-
-    case EAiPublisherEvents:
+        }
+    else if( aProperty == CHsContentPublisher::EPublisherEvents )
+        {
         return iEvents;
-
-    case EAiPluginName:
+        }
+    else if( aProperty == CHsContentPublisher::EPluginName )
+        {
         return StringLoader::LoadL( R_QTN_AI_CALE_PLUGIN_NAME );
-    }
+        }
+		
     return NULL;
     }