diff -r 1a2a00e78665 -r d0529222e3f0 idlefw/plugins/devicestatus/inc/aicugpublisher.h
--- a/idlefw/plugins/devicestatus/inc/aicugpublisher.h	Tue Feb 02 00:23:10 2010 +0200
+++ b/idlefw/plugins/devicestatus/inc/aicugpublisher.h	Fri Feb 19 23:07:29 2010 +0200
@@ -19,15 +19,18 @@
 #ifndef C_AICUGPUBLISHER_H
 #define C_AICUGPUBLISHER_H
 
-
+// System includes
 #include <e32base.h>
 #include <RSSSettings.h>
 #include <MSSSettingsObserver.h>
+
+// User includes
 #include "aidevicestatuspublisher.h"
 #include "aidevicestatuscontentmodel.h"
 
+// Forward declarations
 class MAiDeviceStatusContentObserver;
-class MAiPropertyExtension;
+class CHsContentPublisher;
 
 /**
  *  @ingroup group_devicestatusplugin
@@ -36,8 +39,9 @@
  *
  *  @since S60 3.2
  */
-class CAiCUGPublisher : public CBase, public MAiDeviceStatusPublisher,
-                        public MSSSettingsObserver
+NONSHARABLE_CLASS( CAiCUGPublisher ): public CBase, 
+    public MAiDeviceStatusPublisher,
+    public MSSSettingsObserver
     {
 public:
 
@@ -52,7 +56,7 @@
 
     void ResumeL();
     void Subscribe( MAiContentObserver& aObserver, 
-                    MAiPropertyExtension& aExtension,
+                    CHsContentPublisher& aExtension,
                     MAiPublishPrioritizer& aPrioritizer,
                     MAiPublisherBroadcaster& aBroadcaster );
     void RefreshL( TBool aClean );
@@ -87,7 +91,7 @@
      * Property extension.
      * Not own.
      */
-    MAiPropertyExtension* iExtension;
+    CHsContentPublisher* iExtension;
 
     /**
      * SS Settings client. Used to observer CUG changes.