--- a/dcmofw/dcmoserver/inc/dcmoserver.h	Thu Aug 19 10:44:50 2010 +0300
+++ b/dcmofw/dcmoserver/inc/dcmoserver.h	Tue Aug 31 16:04:06 2010 +0300
@@ -21,27 +21,28 @@
 // INCLUDES
 
 #include <e32base.h>
+#include <hbdevicemessageboxsymbian.h>
 #include "dcmoclientserver.h"
 #include "dcmoconst.h"
-#include "dcmonotifieraob.h"
-#include <lawmocallbackinterface.h>
+#include "dcmomessagebox.h"
+
+
 // CONSTANTS
 const TUid KCRUidDCMOServer={0x2001FE47};
 const TInt KDCMOKeyMaxNumber = 16;
 // FORWARD DECLARATIONS
 // CLASS DECLARATION
-class CLAWMOPluginInterface;
+
 /**
 *  CDCMOServer
 *  Description.
 */
 
 
-class CDCMOServer : public CServer2,
-                    public MLawmoPluginWipeObserver
+class CDCMOServer : public CServer2
 	{
 	friend class CDCMOSession;
-	friend class CDCMONotifierAob;
+	friend class CDCMOMessageBox;
 
 public:
 	/**
@@ -86,11 +87,6 @@
 	 * @return None
 	 */
 	void DropSession();
-public:
-	
-	// Callback from MLawmoPluginWipeObserver
-	void HandleWipeCompleted(TInt status);
-	//void SendGenericAlert();
 	
 private:
 	/**
@@ -173,15 +169,12 @@
 	 */
 	void SetStarter(TBool aValue);	
 	
-    TLawMoStatus WipeItem(TInt aValue=0);
-	
-    TLawMoStatus WipeAllItem();
-
-	TLawMoStatus GetListItemL(TDesC& item, TDes& strValue);
-
-	TLawMoStatus GetToBeWipedL(TDesC& item, TDes& wipeValue);
-
-	TLawMoStatus SetToBeWipedL(TDesC& item, TInt wipeValue);
+	/**
+	 * Deletes the idcmoArray value if any
+	 * @param none
+	 * @return none
+	 */
+	void CleanDcmoArray();	
 	
 private:
 	
@@ -190,7 +183,7 @@
 	 * @param aCategory
 	 * @return the uid
 	 */
-	TUid GetAdapterUidL(const TDesC& aCategory, TBool aIsLawmo = EFalse);
+	TUid GetAdapterUidL(const TDesC& aCategory);
 	
 	/**
 	 * Finds whether the plug-in adapter is a generic category
@@ -199,19 +192,11 @@
 	 */
 		TInt GetLocalCategoryL(const TDesC& aCategory);	
 	
-	void GetLawmoPluginUidsL();
-	
-	void StartDMNetworkMonitorL(TDesC& aServerId, TInt iapid=0);
 private:
 	RArray<dcmoInfoList> idcmoArray;
 	static TInt iSessionCount;
 	TBool iStarter;	
-	CDCMONotifierAob* iNotifier;
-	RArray<TUid> ilawmoPluginUidToBeWiped;
-	RArray<CLAWMOPluginInterface*> ilawmoPlugins;
-	TInt iwipeStatus;
-    TInt iCount;
-    TInt iSessionIap;
+	CDCMOMessageBox* iMessageBox;
 	};
 	
 #endif //__DCMO_SERVER_H__