--- a/widgets/widgetapp/src/cpspublisher.cpp	Mon Mar 30 12:54:55 2009 +0300
+++ b/widgets/widgetapp/src/cpspublisher.cpp	Fri May 08 08:25:06 2009 +0300
@@ -22,7 +22,7 @@
 #include <LiwVariant.h>
 #include <LiwGenericParam.h>
 #include <Liwcommon.h>
-
+#include <liwcommon.hrh>
 #include <AknsFrameBackgroundControlContext.h>
 #include <fbs.h>
 #include <aknsdrawutils.h> 
@@ -149,6 +149,9 @@
 
 CCpsPublisher::~CCpsPublisher()
     {
+    
+    TRAP_IGNORE(ExecuteRegistrationCommandL( KLiwOptCancel ));
+    
     if( iCpsInterface )
         {
         iCpsInterface->Close();
@@ -161,6 +164,7 @@
         iServiceHandler = NULL;
         }
     delete iMaskBitmap;
+__UHEAP_MARKEND;    
     }
 
 CLiwDefaultMap* ElementSizeFilterLC()
@@ -196,6 +200,7 @@
 
 void CCpsPublisher::ConstructL()
     {
+    __UHEAP_MARK;
     RDebug::Printf("CCpsPublisher::InitCPS");
     InitCpsInterfaceL();
     RDebug::Printf("CCpsPublisher::Register");
@@ -249,7 +254,6 @@
 void CCpsPublisher::ExecuteRegistrationCommandL( 
     TUint aOption )
     {
-    __UHEAP_MARK;
     CLiwDefaultMap* filter = ElementSizeFilterLC();
     filter->InsertL( KOperation, TLiwVariant( KUpdate ));
     
@@ -270,7 +274,6 @@
     outParamList.Reset();
     inParamList.Reset(); 
     CleanupStack::PopAndDestroy( filter );
-    __UHEAP_MARKEND;
     }
 
 TInt CCpsPublisher::HandleNotifyL(