--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hspreviewhswidgetstate.h	Wed Jul 14 15:53:30 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hspreviewhswidgetstate.h	Fri Jul 23 13:47:57 2010 +0300
@@ -23,6 +23,8 @@
 #include <QVariant>
 
 #include "hsmenustates_global.h"
+#include "hsmenuentryremovedhandler.h"
+
 HS_STATES_TEST_CLASS(MenuStatesTest)
 
 class QAction;
@@ -34,7 +36,6 @@
 class HbScrollArea;
 class HbMessageBox;
 
-
 class HsPreviewHSWidgetState : public QState
 {
     Q_OBJECT
@@ -52,7 +53,7 @@
     void previewDialogFinished(HbAction* finishedAction);
 
     void messageWidgetCorruptedFinished(HbAction* finishedAction);
-
+    
     void onEntry(QEvent *event);
 
     void cleanUp();
@@ -63,23 +64,20 @@
 private:
 
     void showMessageWidgetCorrupted();
-
-    void subscribeForMemoryCardRemove();
     
     HbDialog* buildPreviewDialog(const CaEntry& entry) const;
 
 private:
     
     HbDialog *mPreviewDialog;
-
-    CaNotifier *mNotifier;
-
+    QScopedPointer<HsMenuEntryRemovedHandler> mEntryObserver;
     int mEntryId;
 
     HbMessageBox *mCorruptedMessage;
 
-    QAction *mConfirmAction;
-
+    QAction *mConfirmRemovalAction;
+    QAction *mAddToHomescreenAction;
+    
     QVariant mToken;
     
     QString mUri;