--- a/idlefw/plugins/devicestatus/inc/aipublishprioritizer.h	Tue Feb 02 00:23:10 2010 +0200
+++ b/idlefw/plugins/devicestatus/inc/aipublishprioritizer.h	Fri Feb 19 23:07:29 2010 +0200
@@ -19,10 +19,16 @@
 #ifndef C_AIPUBLISHPRIORITIZER_H
 #define C_AIPUBLISHPRIORITIZER_H
 
+// System includes
 #include <e32def.h>
+
+// User includes
 #include "ainwidpriorities.h"
 #include "aiprioritizer.h"
-#include "aipropertyextension.h"
+
+// Forward declarations
+class CHsContentPublisher;
+
 
 /**
  *  @ingroup group_devicestatusplugin
@@ -37,13 +43,13 @@
  *  @since S60 3.2
  */
  
-class CAiPublishPrioritizer : public CBase, public MAiPublishPrioritizer
+NONSHARABLE_CLASS( CAiPublishPrioritizer ) : public CBase, 
+    public MAiPublishPrioritizer
     {
-
 public:
 
     static CAiPublishPrioritizer* NewL( MAiContentObserver& aContentObserver,
-                                        MAiPropertyExtension& aPropertyExtension );
+                                        CHsContentPublisher& aPropertyExtension );
 
     virtual ~CAiPublishPrioritizer();
 
@@ -75,7 +81,7 @@
 private:
 
     CAiPublishPrioritizer( MAiContentObserver& aContentObserver,
-                            MAiPropertyExtension& aPropertyExtension );
+                            CHsContentPublisher& aPropertyExtension );
 
 
 private: // data
@@ -88,7 +94,7 @@
     /**
      * Property extension.
      */
-    MAiPropertyExtension& iPropertyExtension;
+    CHsContentPublisher& iPropertyExtension;
 
     /// Current priority
     TInt iPriority;