--- a/dcmofw/dcmoserver/data/dcmo.rss	Tue Jul 13 09:37:43 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Resource file for DCMO component.
-*
-*/
-
-
-//  INCLUDES
-#include <bldvariant.hrh>
-#include <eikon.rh>
-#include <avkon.rh>
-#include <avkon.rsg>
-#include <dcmo.loc>
-
-RESOURCE RSS_SIGNATURE { }
-
-RESOURCE TBUF { buf=""; }
-
-
-//  CONSTANTS  
-
-//  MACROS  
-
-//  RESOURCE DEFINITIONS 
-
- 
-// r_dm_run_time_var_disable
-// Text for showing Disabled
-// Info note for showing the information received.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_dm_run_time_var_disable    { buf = qtn_dm_run_time_var_disable; }
-
-// r_dm_run_time_var_enable
-// Text for showing Enabled
-// Info note for showing the information received.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_dm_run_time_var_enable    { buf = qtn_dm_run_time_var_enable; }
-
-// r_dm_run_time_var_camera
-// Text for showing Camera
-// Info note for showing the information received.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_dm_run_time_var_camera    { buf = qtn_dm_run_time_var_camera; }
-
-// r_dm_run_time_var_firmware_update
-// Text for showing Firmware Update
-// Info note for showing the information received.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_dm_run_time_var_firmware_update    { buf = qtn_dm_run_time_var_firmware_update; }
-
-// r_dm_run_time_var_external_memory_card
-// Text for showing External Memort Card
-// Info note for showing the information received.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_dm_run_time_var_ext_memory    { buf = qtn_dm_run_time_var_ext_memory; }
-
-// r_dm_run_time_var_bluetooth
-// Text for showing Bluetooth
-// Info note for showing the information received.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_dm_run_time_var_bluetooth    { buf = qtn_dm_run_time_var_bluetooth; }
-
-// r_dm_run_time_var_wlan
-// Text for showing WLAN
-// Info note for showing the information received.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_dm_run_time_var_wlan    { buf = qtn_dm_run_time_var_wlan; }
-
-// r_dm_run_time_var_desktop_sync
-// Text for showing Desktop Sync
-// Info note for showing the information received.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_dm_run_time_var_desktop_sync    { buf = qtn_dm_run_time_var_desktop_sync; }
-
-
-// End of File

--- a/dcmofw/dcmoserver/group/bld.inf	Tue Jul 13 09:37:43 2010 +0530
+++ b/dcmofw/dcmoserver/group/bld.inf	Tue Jul 13 09:51:41 2010 +0530
@@ -20,8 +20,6 @@
 PRJ_EXPORTS
 
 
-../loc/dcmo.loc												MW_LAYER_LOC_EXPORT_PATH(dcmo.loc)
-
 // Generic configuration interface for component cenrep settings  
 ../conf/dcmo.confml                   MW_LAYER_CONFML(dcmo.confml)
 ../conf/dcmo_2001FE47.crml 	    	    MW_LAYER_CRML(dcmo_2001FE47.crml)

--- a/dcmofw/dcmoserver/group/dcmoserver.mmp	Tue Jul 13 09:37:43 2010 +0530
+++ b/dcmofw/dcmoserver/group/dcmoserver.mmp	Tue Jul 13 09:51:41 2010 +0530
@@ -29,22 +29,18 @@
 SOURCEPATH    	../src
 SOURCE       	 	dcmoserver.cpp
 SOURCE       	 	dcmosession.cpp
-SOURCE       	 	dcmonotifieraob.cpp
+SOURCE       	 	dcmomessagebox.cpp
 SOURCE					dcmogenericcontrol.cpp
 
 MW_LAYER_SYSTEMINCLUDE
 SYSTEMINCLUDE 	/epoc32/include/ecom
+SYSTEMINCLUDE 	/epoc32/include/mw/hb/hbwidgets
+SYSTEMINCLUDE 	/epoc32/include/mw/hb/hbcore
 USERINCLUDE   	../inc
 USERINCLUDE   	../../inc
 
-START RESOURCE 	../data/dcmo.rss
-    HEADER
-    TARGETPATH  resource
-    LANGUAGE_IDS
-END 
-
-LIBRARY     	euser.lib commonengine.lib efsrv.lib
+LIBRARY     	euser.lib 
 LIBRARY       ecom.lib
 LIBRARY       centralrepository.lib
-LIBRARY				aknnotify.lib eiksrv.lib
 LIBRARY    		flogger.lib
+LIBRARY       hbcore.lib hbwidgets.lib

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dcmofw/dcmoserver/inc/dcmomessagebox.h	Tue Jul 13 09:51:41 2010 +0530
@@ -0,0 +1,75 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  DCMO Message Box
+*
+*/
+
+#ifndef __DCMO_MESSAGEBOX_H__
+#define __DCMO_MESSAGEBOX_H__
+
+// INCLUDES
+
+#include <hbdevicemessageboxsymbian.h>
+
+/**
+* Message Box class to show the global note.
+*
+*/
+class CDCMOMessageBox : public CBase, public MHbDeviceMessageBoxObserver
+	{
+public:
+    static CDCMOMessageBox* NewL( );
+    
+  /**
+	 * Destructor
+	 */
+		~CDCMOMessageBox();
+		
+	/**
+	 * Show the Notification
+	 * @param aString , to be shown
+	 * @return 
+	 */
+		void ShowMessageL( TDesC& aString );
+		
+public: // from MHbDeviceMessageBoxObserver
+    void MessageBoxClosed(const CHbDeviceMessageBoxSymbian *aMessageBox,
+        CHbDeviceMessageBoxSymbian::TButtonId aButton);
+		
+		/**
+	 * Gets the Message Box status
+	 * @param None
+	 * @return ETrue if the user pressed ok button, else EFalse.
+	 */
+		static TBool IsMsgBoxClosed();
+		
+		/**
+	 * Sets the Message Box status
+	 * @param ETrue if the user pressed ok button, else EFalse.
+	 * @return None
+	 */
+		static void SetMsgBoxStatus(TBool aStatus);
+		
+private:  
+	/**
+	 * Createss CDCMOMessageBox
+	 * Default Constructor
+	 */  
+		CDCMOMessageBox( );		
+
+private:		
+		CHbDeviceMessageBoxSymbian* iMessageBox;
+		static TBool iMsgBoxClosed;
+	};
+#endif //__DCMO_MESSAGEBOX_H__

--- a/dcmofw/dcmoserver/inc/dcmonotifieraob.h	Tue Jul 13 09:37:43 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  DCMO Notifier Aob
-*
-*/
-
-#ifndef __DCMO_NOTIFIERAOB_H__
-#define __DCMO_NOTIFIERAOB_H__
-
-// INCLUDES
-
-#include <AknGlobalMsgQuery.h>
-
-/**
-* An active class to show the global note.
-*
-*/
-class CDCMONotifierAob : public CActive
-	{
-public:
-    static CDCMONotifierAob* NewL( );
-    
-  /**
-	 * Destructor
-	 */
-		~CDCMONotifierAob();
-		
-	/**
-	 * Show the Notification
-	 * @param aString , to be shown
-	 * @return 
-	 */
-		void ShowNotifierL( TDesC& aString );
-		
-		/**
-     * From CActive,DoCancel.
-     */
-		void DoCancel();
-
-		/**
-     * From CActive,RunL.
-     */
-	  void RunL();
-
-		/**
-     * From CActive,RunError.
-     */
-		TInt RunError(TInt aError);
-		
-private:  
-	/**
-	 * Createss CDCMOGenericControl
-	 * Default Constructor
-	 */  
-		CDCMONotifierAob( );
-		
-	/**
-	 * second phase constructor
-	 */
-    void ConstructL();
-
-private:		
-		CAknGlobalMsgQuery* iGlobalMsgQuery;
-
-	};
-#endif //__DCMO_NOTIFIERAOB_H__

--- a/dcmofw/dcmoserver/inc/dcmoserver.h	Tue Jul 13 09:37:43 2010 +0530
+++ b/dcmofw/dcmoserver/inc/dcmoserver.h	Tue Jul 13 09:51:41 2010 +0530
@@ -21,9 +21,11 @@
 // INCLUDES
 
 #include <e32base.h>
+#include <hbdevicemessageboxsymbian.h>
 #include "dcmoclientserver.h"
 #include "dcmoconst.h"
-#include "dcmonotifieraob.h"
+#include "dcmomessagebox.h"
+
 
 // CONSTANTS
 const TUid KCRUidDCMOServer={0x2001FE47};
@@ -40,7 +42,7 @@
 class CDCMOServer : public CServer2
 	{
 	friend class CDCMOSession;
-	friend class CDCMONotifierAob;
+	friend class CDCMOMessageBox;
 
 public:
 	/**
@@ -166,7 +168,14 @@
 	 * @return 
 	 */
 	void SetStarter(TBool aValue);	
-
+	
+	/**
+	 * Deletes the idcmoArray value if any
+	 * @param none
+	 * @return none
+	 */
+	void CleanDcmoArray();	
+	
 private:
 	
 	/**
@@ -187,7 +196,7 @@
 	RArray<dcmoInfoList> idcmoArray;
 	static TInt iSessionCount;
 	TBool iStarter;	
-	CDCMONotifierAob* iNotifier;
+	CDCMOMessageBox* iMessageBox;
 	};
 	
 #endif //__DCMO_SERVER_H__

--- a/dcmofw/dcmoserver/loc/dcmo.loc	Tue Jul 13 09:37:43 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Localisation file for DCMO framework.
-*
-*/
-
-
-
-// LOCALISATION STRINGS
-
-//d:Text to be shown for Disabled
-//l:heading_pane_t1
-//r:5.2
-//
-#define qtn_dm_run_time_var_disable   "Disabled by system administrator:"
-
-//d:Text to be shown for Enabled
-//l:heading_pane_t1
-//r:5.2
-//
-#define qtn_dm_run_time_var_enable   "Enabled by system administrator:"
-
-//d:Text to be shown for Camera
-//l:list_single_pane_t1_cp2
-//r:5.2
-//
-#define qtn_dm_run_time_var_camera   "Camera"
-
-//d:Text to be shown for Firmware Update
-//l:list_single_pane_t1_cp2
-//r:5.2
-//
-#define qtn_dm_run_time_var_firmware_update   "Firmware Update"
-
-//d:Text to be shown for External Memory Card
-//l:list_single_pane_t1_cp2
-//r:5.2
-//
-#define qtn_dm_run_time_var_ext_memory   "External Memory Card"
-
-//d:Text to be shown for Bluetooth
-//l:list_single_pane_t1_cp2
-//r:5.2
-//
-#define qtn_dm_run_time_var_bluetooth   "Bluetooth"
-
-//d:Text to be shown for WLAN
-//l:list_single_pane_t1_cp2
-//r:5.2
-//
-#define qtn_dm_run_time_var_wlan   "WLAN"
-
-//d:Text to be shown for Desktop Sync
-//l:list_single_pane_t1_cp2
-//r:5.2
-//
-#define qtn_dm_run_time_var_desktop_sync   "Desktop Sync"
-
-// End of File

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dcmofw/dcmoserver/src/dcmomessagebox.cpp	Tue Jul 13 09:51:41 2010 +0530
@@ -0,0 +1,107 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  DCMO Message Box 
+*
+*/
+
+
+#include "dcmomessagebox.h"
+#include "dcmoserver.h"
+#include "dcmodebug.h"
+
+TBool CDCMOMessageBox::iMsgBoxClosed = EFalse;
+
+// --------------------------------------------------------------------------
+// CDCMOMessageBox* CDCMOMessageBox::NewL( )
+// --------------------------------------------------------------------------
+//
+CDCMOMessageBox* CDCMOMessageBox::NewL( )
+	{
+		RDEBUG("CDCMOMessageBox::NewL begin");
+		CDCMOMessageBox* self = new (ELeave) CDCMOMessageBox( );
+  	RDEBUG("CDCMOMessageBox::NewL end");
+		return self;		
+	}
+
+// --------------------------------------------------------------------------
+// CDCMOMessageBox::CDCMOMessageBox( )
+// --------------------------------------------------------------------------
+//
+CDCMOMessageBox::CDCMOMessageBox( ) 
+	{
+		iMessageBox = NULL;
+		RDEBUG("CDCMOMessageBox::constructor");
+	}
+
+// --------------------------------------------------------------------------
+// CDCMOMessageBox::~CDCMOMessageBox()
+// --------------------------------------------------------------------------
+//
+CDCMOMessageBox::~CDCMOMessageBox()
+	{
+		RDEBUG("CDCMOMessageBox::~CDCMOMessageBox begin");   
+		if( iMessageBox )
+		{
+			delete iMessageBox ;
+    	iMessageBox = NULL; 
+		}	
+		RDEBUG("CDCMOMessageBox::~CDCMOMessageBox end");    
+  }
+
+// --------------------------------------------------------------------------
+// TBool CDCMOMessageBox::IsMsgBoxClosed( )
+// --------------------------------------------------------------------------
+//
+TBool CDCMOMessageBox::IsMsgBoxClosed()
+	{
+		return iMsgBoxClosed;
+	}
+
+// --------------------------------------------------------------------------
+// void CDCMOMessageBox::SetMsgBoxStatus( TBool aStatus )
+// --------------------------------------------------------------------------
+//
+void CDCMOMessageBox::SetMsgBoxStatus(TBool aStatus)
+{
+		iMsgBoxClosed = aStatus;
+}
+	
+// --------------------------------------------------------------------------
+// void CDCMOMessageBox::ShowNotifierL( TDesC& aString )
+// --------------------------------------------------------------------------
+//
+void CDCMOMessageBox::ShowMessageL( TDesC& aString )
+{
+		RDEBUG("CDCMOMessageBox::ShowMessageL() : Begin");
+		if( !iMessageBox )
+			iMessageBox = CHbDeviceMessageBoxSymbian::NewL();			
+		iMessageBox->SetTimeout(0); //HbPopup::NoTimeout); 
+		iMessageBox->SetDismissPolicy(0); //HbPopup::NoDismiss
+		iMessageBox->SetTextL(aString);
+		iMessageBox->SetObserver(this);
+		iMessageBox->ShowL();		
+		RDEBUG("CDCMOMessageBox::ShowMessageL() : End");	
+}
+
+void CDCMOMessageBox::MessageBoxClosed(const CHbDeviceMessageBoxSymbian */*aMessageBox*/,
+     CHbDeviceMessageBoxSymbian::TButtonId /*aButton*/)
+ {
+  		 delete	iMessageBox;
+  		 iMessageBox = NULL;
+    	 iMsgBoxClosed = ETrue;	
+    	 if( CDCMOServer::iSessionCount == 0)
+    		CActiveScheduler::Stop();
+ }
+	
+//  End of File

--- a/dcmofw/dcmoserver/src/dcmonotifieraob.cpp	Tue Jul 13 09:37:43 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,148 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  DCMO Notifier Aob
-*
-*/
-
-
-#include "dcmonotifieraob.h"
-#include "dcmoserver.h"
-#include "dcmodebug.h"
-
-
-// --------------------------------------------------------------------------
-// CDCMONotifierAob* CDCMONotifierAob::NewL( CAknGlobalMsgQuery& aGlobalMsgQuery )
-// --------------------------------------------------------------------------
-//
-CDCMONotifierAob* CDCMONotifierAob::NewL( )
-	{
-		RDEBUG("CDCMONotifierAob::NewL begin");
-		CDCMONotifierAob* self = new (ELeave) CDCMONotifierAob( );
-		CleanupStack::PushL(self);
-  	self->ConstructL();
-  	CleanupStack::Pop(); // self
-  	RDEBUG("CDCMONotifierAob::NewL end");
-		return self;		
-	}
-
-// --------------------------------------------------------------------------
-// CDCMONotifierAob::CDCMONotifierAob( CAknGlobalMsgQuery& aGlobalMsgQuery )
-// --------------------------------------------------------------------------
-//
-CDCMONotifierAob::CDCMONotifierAob( ) 
-	:CActive( EPriorityStandard ) //EPriorityNormal )  
-	{
-		RDEBUG("CDCMONotifierAob::constructor");
-	}
-
-
-// --------------------------------------------------------------------------
-// void CDCMONotifierAob::ConstructL()
-// --------------------------------------------------------------------------
-//
-void CDCMONotifierAob::ConstructL()
-    {   
-    	RDEBUG("CDCMONotifierAob::ConstructL begin");		
-    	iGlobalMsgQuery = NULL;
-    	CActiveScheduler::Add(this);	
-    	RDEBUG("CDCMONotifierAob::ConstructL end");    	
-    }
-
-// --------------------------------------------------------------------------
-// CDCMONotifierAob::~CDCMONotifierAob()
-// --------------------------------------------------------------------------
-//
-CDCMONotifierAob::~CDCMONotifierAob()
-	{
-		RDEBUG("CDCMONotifierAob::~CDCMONotifierAob begin");   
-		if( iGlobalMsgQuery )
-		{
-			delete iGlobalMsgQuery ;
-    	iGlobalMsgQuery = NULL; 
-		}	
-		RDEBUG("CDCMONotifierAob::~CDCMONotifierAob end");    
-  }
-
-// --------------------------------------------------------------------------
-// void CDCMONotifierAob::RunL()
-// --------------------------------------------------------------------------
-//
-void CDCMONotifierAob::RunL()
-    {
-    RDEBUG("CDCMONotifierAob::RunL() : Begin");   
-
-    if(iStatus == EAknSoftkeyOk)
-    {
-    	RDEBUG("CDCMONotifierAob::RunL() : EAknSoftkeyOk");     	
-    	delete iGlobalMsgQuery ;
-    	iGlobalMsgQuery = NULL; 	
-    	if( CDCMOServer::iSessionCount == 0)
-    		CActiveScheduler::Stop();
-    }
-        
-    RDEBUG("CDCMONotifierAob::RunL() : End");
-    }
-
-// --------------------------------------------------------------------------
-// void CDCMONotifierAob::DoCancel()
-// --------------------------------------------------------------------------
-//
-void CDCMONotifierAob::DoCancel()
-   {
-   		RDEBUG("CDCMONotifierAob::DoCancel() : Begin");
-   		iGlobalMsgQuery->CancelMsgQuery();
-    	delete iGlobalMsgQuery ;
-    	iGlobalMsgQuery = NULL; 	
-			RDEBUG("CDCMONotifierAob::DoCancel() : End");
-	 }
-
-// --------------------------------------------------------------------------
-// void CDCMONotifierAob::ShowNotifierL( TDesC& aString )
-// --------------------------------------------------------------------------
-//
-void CDCMONotifierAob::ShowNotifierL( TDesC& aString )
-{
-		RDEBUG("CDCMONotifierAob::ShowNotifierL() : Begin");
-		if( !iGlobalMsgQuery )
-			iGlobalMsgQuery = CAknGlobalMsgQuery::NewL();
-		if (!IsActive())
-    {
-			iStatus = KRequestPending;		
-		     
-			iGlobalMsgQuery->ShowMsgQueryL(
-		                    iStatus, 
-		                    aString,
-		                    R_AVKON_SOFTKEYS_OK_EMPTY, //R_AVKON_SOFTKEYS_OK_EMPTY, //R_AVKON_SOFTKEYS_OK_CANCEL,
-		                    KNullDesC,
-		                    KNullDesC);  
-			SetActive();                    
-		}
-		RDEBUG("CDCMONotifierAob::ShowNotifierL() : End");	
-}
-
-// -----------------------------------------------------------------------------
-// CDCMONotifierAob::RunError
-// Called when RunL leaves
-// This method can't leave
-// -----------------------------------------------------------------------------
-
-TInt CDCMONotifierAob::RunError(TInt /* aError */)
-	{
-	RDEBUG("CDCMONotifierAob::RunError >>");
-			
-	RDEBUG("CDCMONotifierAob::RunError <<");
-	return KErrNone;
-	}
-	
-//  End of File

--- a/dcmofw/dcmoserver/src/dcmoserver.cpp	Tue Jul 13 09:37:43 2010 +0530
+++ b/dcmofw/dcmoserver/src/dcmoserver.cpp	Tue Jul 13 09:51:41 2010 +0530
@@ -21,10 +21,9 @@
 #include <e32base.h>
 #include <centralrepository.h>
 #include <stringresourcereader.h> 
-#include <dcmo.rsg> // Resource to be read header
-#include <AknGlobalMsgQuery.h>
 #include <data_caging_path_literals.hrh>
 #include <f32file.h> 
+#include <hbtextresolversymbian.h>
 #include "dcmoclientserver.h"
 #include "dcmoconst.h"
 #include "dcmointerface.h"
@@ -33,7 +32,9 @@
 #include "dcmogenericcontrol.h"
 #include "dcmodebug.h"
 
-_LIT( KdcmoResourceFileName, "z:dcmo.rsc" );	
+
+_LIT( KdcmoResourceFileName, "deviceupdates_" );	
+_LIT( KdcmoResourceFilePath, "z:/resource/qt/translations/" );	
 const TInt KBufferSize = 256;
 
 TInt CDCMOServer::iSessionCount = 0;
@@ -114,7 +115,7 @@
 CDCMOServer::CDCMOServer() : CServer2(EPriorityStandard, EUnsharableSessions) /*CServer2(0)*/
 	{	
 		iStarter = EFalse;
-		iNotifier = NULL;
+		iMessageBox = NULL;
 	}
 
 // ----------------------------------------------------------------------------------------
@@ -130,8 +131,8 @@
 		for(TInt i=0; i< count; i++)
 				delete idcmoArray[i].iCategoryName;
 		idcmoArray.Reset();
-		delete iNotifier;
-		iNotifier = NULL;	
+		delete iMessageBox;
+		iMessageBox = NULL;	
 	}
 	else
 	{
@@ -157,7 +158,11 @@
   		RDEBUG("CDCMOServer::DropSession(): Starter");
   		SetStarter( EFalse );
   		return;                 
-  	}   
+  	} 
+  	if(CDCMOMessageBox::IsMsgBoxClosed())
+  	{
+  		CleanDcmoArray();
+  	}  
 		if( idcmoArray.Count() && ( iSessionCount == 0 ))
 		{
 			// A session is being destroyed		
@@ -369,25 +374,21 @@
 			RDEBUG("CDCMOServer::SetIntAttributeL(): LocalCategory");
 			CDCMOGenericControl* iGenericControl = new(ELeave) CDCMOGenericControl;
 			err = iGenericControl->SetIntAttributeL(categotyNumber, id, value);	
-			TFileName myFileName;
-  		TParse parseObj;
-  		parseObj.Set( KdcmoResourceFileName(), &KDC_RESOURCE_FILES_DIR,NULL );
- 			myFileName = parseObj.FullName();
- 			CStringResourceReader* test = CStringResourceReader::NewL( myFileName );
+			
+			TBool result = HbTextResolverSymbian::Init(KdcmoResourceFileName, KdcmoResourceFilePath );					
+
 			TPtrC buf;
 			dcmoList.iUid = categotyNumber;
 			if(categotyNumber == 0)
-			    {			    
-			    buf.Set(test->ReadResourceString(R_DM_RUN_TIME_VAR_CAMERA));
-			    stringHolder = buf.AllocL() ; 
+			    {
+					_LIT(KTextCamera, "txt_device_update_info_camera");
+					stringHolder = HbTextResolverSymbian::LoadL(KTextCamera);
 			    } 
 			else
-			    {			   
-			    buf.Set(test->ReadResourceString(R_DM_RUN_TIME_VAR_FIRMWARE_UPDATE));
-			    stringHolder = buf.AllocL() ; 
-			    }			
-     delete test;
-     test = NULL;
+			    {	
+					_LIT(KTextFOTA, "txt_device_update_info_firmware_update");
+					stringHolder = HbTextResolverSymbian::LoadL(KTextFOTA);
+			    }		
   	 delete iGenericControl;
 		 iGenericControl = NULL;
 	}
@@ -416,7 +417,7 @@
   		RDEBUG("CDCMOServer::SetIntAttributeL(): Starter");
   		SetStarter ( EFalse );
   		delete stringHolder;
-		stringHolder = NULL;
+			stringHolder = NULL;
   		return err;                
    }   
 	if((err == EDcmoSuccess) && (id == EEnable) ) 
@@ -477,7 +478,7 @@
 	RDEBUG("CDCMOServer::DoFinalizeL(): begin");	   
 
 	HBufC* content  = HBufC::NewLC(KDCMOMaxStringSize);
-  	TPtr   contentptr  = content->Des(); 
+  TPtr   contentptr  = content->Des(); 
 	HBufC* enableContent  = HBufC::NewLC(KDCMOMaxStringSize);
 	TPtr   enableContentptr  = enableContent->Des(); 
 	HBufC* disableContent  = HBufC::NewLC(KDCMOMaxStringSize);
@@ -485,10 +486,6 @@
 
 	TBool enable ( EFalse );
 	TBool disable ( EFalse );
-	TFileName myFileName;
-  TParse parseObj;
-  parseObj.Set( KdcmoResourceFileName(), &KDC_RESOURCE_FILES_DIR,NULL );
-  myFileName = parseObj.FullName();
 	TInt arrayCount = idcmoArray.Count(); 
 	_LIT(KNewLine, "\n");
 		
@@ -509,38 +506,34 @@
       		disableContentptr.Append( idcmoArray[i].iCategoryName->Des() );
       		disable = ETrue;
       	}	
-		}
-	  
-  	CStringResourceReader* test = CStringResourceReader::NewL( myFileName );	  
+		}	  
+  
+		TBool result = HbTextResolverSymbian::Init(KdcmoResourceFileName, KdcmoResourceFilePath );
 		if ( enable )
 		{
-			TPtrC buf;
-			buf.Set(test->ReadResourceString(R_DM_RUN_TIME_VAR_ENABLE)); 	    	
-			contentptr.Append(buf);
+			_LIT(KTextEnabled, "txt_device_update_title_enabled_by_the_system_admi");
+			HBufC* buf = HbTextResolverSymbian::LoadL(KTextEnabled);
+			contentptr.Append(buf->Des());
 	 		contentptr.Append(enableContentptr);
+	 		delete buf;
 		}
 		if ( disable )
 		{
-	 		TPtrC buf;
-	 		buf.Set(test->ReadResourceString(R_DM_RUN_TIME_VAR_DISABLE));
+	 		_LIT(KTextDisabled, "txt_device_update_title_disabled_by_the_system_adm");
+			HBufC* buf = HbTextResolverSymbian::LoadL(KTextDisabled);
 	 		if( enable )
-	 			contentptr.Append(KNewLine());
-	 		contentptr.Append(buf);
+	 			contentptr.Append(KNewLine());	 		
+			contentptr.Append(buf->Des());
 	 		contentptr.Append(disableContentptr);
+	 		delete buf;
 		}
-		delete test;
-		test = NULL;
-		
-		if( iNotifier )
-		{
-			iNotifier->Cancel();
+	
+		if( !iMessageBox )
+		{		
+			iMessageBox = CDCMOMessageBox::NewL();					
 		}
-		else
-		{			
-			iNotifier = CDCMONotifierAob::NewL( );			
-		}
-		
-	  iNotifier->ShowNotifierL(contentptr);    
+		iMessageBox->ShowMessageL(contentptr);
+
 	  CleanupStack::PopAndDestroy(3); //disableContent, enableContent, content
 	}	
 	RDEBUG("CDCMOServer::DoFinalizeL(): end");
@@ -618,3 +611,22 @@
 	iStarter = aValue;
 	RDEBUG("CDCMOServer::SetStarter(): end");
 }
+
+// ----------------------------------------------------------------------------------------
+// CDCMOServer::CleanDcmoArray
+// Sets the iStarter value
+// ----------------------------------------------------------------------------------------
+void CDCMOServer::CleanDcmoArray()
+{
+	RDEBUG("CDCMOServer::CleanDcmoArray(): begin");
+	TInt count = idcmoArray.Count();  
+  RDEBUG_2("CDCMOServer::CleanDcmoArray; %d", count );
+	if(count)
+	{	
+		for(TInt i=0; i< count; i++)
+				delete idcmoArray[i].iCategoryName;
+		idcmoArray.Reset();
+	}
+	CDCMOMessageBox::SetMsgBoxStatus(EFalse);
+	RDEBUG("CDCMOServer::CleanDcmoArray(): end");
+}

--- a/dcmofw/dcmoserver/src/dcmosession.cpp	Tue Jul 13 09:37:43 2010 +0530
+++ b/dcmofw/dcmoserver/src/dcmosession.cpp	Tue Jul 13 09:51:41 2010 +0530
@@ -19,6 +19,7 @@
 
 #include "dcmosession.h"
 #include "dcmoclientserver.h"
+#include "dcmomessagebox.h"
 #include "dcmodebug.h"
 
 
@@ -73,6 +74,10 @@
   TPckg<TDCMONode> node(nodeValue);
   TPckg<TInt> intvalue(value);
   
+  if(CDCMOMessageBox::IsMsgBoxClosed())
+  	{
+  		Server().CleanDcmoArray();
+  	}
   HBufC*     category  = HBufC::NewLC(KDCMOMaxStringSize);
   TPtr       categoryptr  = category->Des(); 
   aMessage.Read (0, categoryptr);           

--- a/dcmofw/group/bld.inf	Tue Jul 13 09:37:43 2010 +0530
+++ b/dcmofw/group/bld.inf	Tue Jul 13 09:51:41 2010 +0530
@@ -18,7 +18,6 @@
 
 PRJ_EXPORTS
 ../rom/dcmofw.iby				CORE_MW_LAYER_IBY_EXPORT_PATH(dcmofw.iby)
-../rom/dcmofwresources.iby			LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(dcmofwresources.iby)
 
 PRJ_MMPFILES
 #include "../dcmoclient/group/bld.inf"

--- a/dcmofw/rom/dcmofw.iby	Tue Jul 13 09:37:43 2010 +0530
+++ b/dcmofw/rom/dcmofw.iby	Tue Jul 13 09:51:41 2010 +0530
@@ -22,7 +22,7 @@
 file=ABI_DIR\BUILD_DIR\dcmoclient.dll		SHARED_LIB_DIR\dcmoclient.dll
 
 #ifdef FF_RUNTIME_DEVICE_CAPABILITY_CONFIGURATION
-data=DATAZ_\RESOURCE_FILES_DIR\dcmo.rsc	RESOURCE_FILES_DIR\dcmo.rsc
+
 file=ABI_DIR\BUILD_DIR\dcmoserver.exe		PROGRAMS_DIR\dcmoserver.exe
 
 data=\epoc32\data\Z\private\10202BE9\2001FE47.txt       private\10202BE9\2001FE47.txt

--- a/dcmofw/rom/dcmofwresources.iby	Tue Jul 13 09:37:43 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:   Image description file for project dcmofw
-*
-*/
-
-
-#ifndef _DCMOFWRESOURCES_IBY_
-#define _DCMOFWRESOURCES_IBY_
-
-
-#ifdef FF_RUNTIME_DEVICE_CAPABILITY_CONFIGURATION
-data=DATAZ_\RESOURCE_FILES_DIR\dcmo.rsc	RESOURCE_FILES_DIR\dcmo.rsc
-#endif
-#endif
-

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/devicemgmtnotifications/dmdevdialogclient/bld/bld.inf	Tue Jul 13 09:51:41 2010 +0530
@@ -0,0 +1,25 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Implementation of syncml dm device dialogs
+*
+*/
+
+// BLD.INF
+// Component description file 
+//
+
+PRJ_MMPFILES
+
+dmdevdialogclient.mmp
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/devicemgmtnotifications/dmdevdialogclient/bld/dmdevdialogclient.mmp	Tue Jul 13 09:51:41 2010 +0530
@@ -0,0 +1,38 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Implementation of dm device dialogs
+*
+*/
+
+#include <platform_paths.hrh>
+#include <defaultcaps.hrh>
+
+CAPABILITY	CAP_CLIENT_DLL 
+
+TARGET        dmdevdialogclient.dll
+TARGETTYPE    dll
+UID 0x1000008D 0x2002FF67
+VENDORID 			VID_DEFAULT
+
+SOURCEPATH    ../src
+SOURCE        dmdevdialogclient.cpp
+
+USERINCLUDE   ../inc
+USERINCLUDE   ../../inc
+
+MW_LAYER_SYSTEMINCLUDE
+
+LIBRARY       euser.lib  
+LIBRARY 	  efsrv.lib 
+DEBUGLIBRARY       flogger.lib

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/devicemgmtnotifications/dmdevdialogclient/bwins/dmdevdialogclientu.def	Tue Jul 13 09:51:41 2010 +0530
@@ -0,0 +1,11 @@
+EXPORTS
+	?ShowConnectDialog@RDmDevDialog@@QAEHXZ @ 1 NONAME ; int RDmDevDialog::ShowConnectDialog(void)
+	?IsPkgZeroConnectNoteShown@RDmDevDialog@@QAEHAAH@Z @ 2 NONAME ; int RDmDevDialog::IsPkgZeroConnectNoteShown(int &)
+	?ShowConfirmationAlert@RDmDevDialog@@QAEXABHABVTDesC16@@1AAVTRequestStatus@@@Z @ 3 NONAME ; void RDmDevDialog::ShowConfirmationAlert(int const &, class TDesC16 const &, class TDesC16 const &, class TRequestStatus &)
+	?Close@RDmDevDialog@@QAEXXZ @ 4 NONAME ; void RDmDevDialog::Close(void)
+	?LaunchPkgZero@RDmDevDialog@@QAEXABH00AAVTDes8@@AAVTRequestStatus@@@Z @ 5 NONAME ; void RDmDevDialog::LaunchPkgZero(int const &, int const &, int const &, class TDes8 &, class TRequestStatus &)
+	?OpenL@RDmDevDialog@@QAEHXZ @ 6 NONAME ; int RDmDevDialog::OpenL(void)
+	?DismissConnectDialog@RDmDevDialog@@QAEHXZ @ 7 NONAME ; int RDmDevDialog::DismissConnectDialog(void)
+	?ShowDisplayAlert@RDmDevDialog@@QAEXABVTDesC16@@AAVTRequestStatus@@@Z @ 8 NONAME ; void RDmDevDialog::ShowDisplayAlert(class TDesC16 const &, class TRequestStatus &)
+	?CancelPkgZeroNote@RDmDevDialog@@QAEHXZ @ 9 NONAME ; int RDmDevDialog::CancelPkgZeroNote(void)
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/devicemgmtnotifications/dmdevdialogclient/eabi/dmdevdialogclientu.def	Tue Jul 13 09:51:41 2010 +0530
@@ -0,0 +1,11 @@
+EXPORTS
+	_ZN12RDmDevDialog13LaunchPkgZeroERKiS1_S1_R5TDes8R14TRequestStatus @ 1 NONAME
+	_ZN12RDmDevDialog16ShowDisplayAlertERK7TDesC16R14TRequestStatus @ 2 NONAME
+	_ZN12RDmDevDialog17CancelPkgZeroNoteEv @ 3 NONAME
+	_ZN12RDmDevDialog17ShowConnectDialogEv @ 4 NONAME
+	_ZN12RDmDevDialog20DismissConnectDialogEv @ 5 NONAME
+	_ZN12RDmDevDialog21ShowConfirmationAlertERKiRK7TDesC16S4_R14TRequestStatus @ 6 NONAME
+	_ZN12RDmDevDialog25IsPkgZeroConnectNoteShownERi @ 7 NONAME
+	_ZN12RDmDevDialog5CloseEv @ 8 NONAME
+	_ZN12RDmDevDialog5OpenLEv @ 9 NONAME
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/devicemgmtnotifications/dmdevdialogclient/inc/dmdevdialogclientdebug.h	Tue Jul 13 09:51:41 2010 +0530
@@ -0,0 +1,63 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Implementation of Dm device dialog client
+*
+*/
+
+#ifndef DEVDIALOG_CLIENT_DEBUG_H_
+#define DEVDIALOG_CLIENT_DEBUG_H_
+#ifdef _DEBUG
+   #ifdef _DEVDIALOG_DEBUG
+#endif
+        #include <e32std.h>
+        #include <f32file.h>
+        #include <flogger.h>
+        #include <e32svr.h>
+
+        _LIT( KLogFile, "devdiag.log" );
+        _LIT( KLogDirFullName, "c:\\logs\\" );
+        _LIT( KLogDir, "DMDD" );
+
+        inline void FWrite (TRefByValue<const TDesC> aFmt,...)
+            {
+            VA_LIST list;
+            VA_START( list, aFmt );
+            RFileLogger::WriteFormat( KLogDir,KLogFile,EFileLoggingModeAppend ,TPtrC(aFmt) ,list );
+            }
+
+
+        #ifdef __DEVDIALOG_DEBUG_RDEBUG 
+            #ifndef __GNUC__          
+                #define FLOG            RDebug::Print
+            #else   // __GNUC__       
+                #define FLOG(arg...)    RDebug::Print(arg);
+            #endif // __GNUC__        
+        #else //__DEVDIALOG_DEBUG_RDEBUG
+            #ifndef __GNUC__          
+                #define FLOG            FWrite
+            #else   // __GNUC__       
+                #define FLOG(arg...)    FWrite(arg);
+            #endif // __GNUC__        
+        #endif // __DEVDIALOG_DEBUG_RDEBUG
+
+    #else   // _DEVDIALOG_DEBUG
+        #ifndef __GNUC__
+            #define FLOG
+        #else
+            #define FLOG(arg...)
+        #endif // __GNUC__
+    #endif // _DEVDIALOG_DEBUG
+
+
+#endif /*FMSCLIENTDEBUG_H_*/

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/devicemgmtnotifications/dmdevdialogclient/src/dmdevdialogclient.cpp	Tue Jul 13 09:51:41 2010 +0530
@@ -0,0 +1,167 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Implementation of fotaserver component
+* 	This is part of fotaapplication.
+*
+*/
+
+#include <dmdevdialogclient.h>
+#include "dmdevdialogclientserver.h"
+#include "dmdevdialogclientdebug.h"
+
+// ---------------------------------------------------------------------------
+// StartServerL()  
+// Starts DM device Dialog server
+// ---------------------------------------------------------------------------
+TInt StartServerL()
+	{
+	FLOG(_L("StartServerLt Started"));
+	TInt res = KErrNone;
+	RProcess server;
+	res=server.Create(KDMDEVDIALOGSERVER,KNullDesC);
+	FLOG(_L("StartServerL-- create server error as %d"),res);
+	if (res!=KErrNone)
+		{		
+		return res;
+		}
+	TRequestStatus stat;
+	server.Rendezvous(stat);
+	if (stat!=KRequestPending)
+		server.Kill(0);		// abort startup
+	else
+		server.Resume();	// logon OK - start the server
+	User::WaitForRequest(stat);		// wait for start or death
+	res=(server.ExitType()==EExitPanic) ? KErrGeneral : stat.Int();
+	FLOG(_L("StartServerL-- server.ExitType() returns %d"),res);
+	server.Close();
+	return res;
+	}
+
+// ---------------------------------------------------------------------------
+// RDmDevDialog::OpenL()
+// ---------------------------------------------------------------------------
+EXPORT_C TInt RDmDevDialog::OpenL()
+	{	
+	FLOG(_L("RDmDevDialog::OpenL()- Begin"));
+	TInt res = KErrNone;
+		FLOG(_L("RDmDevDialog::OpenL()- Secured client"));
+		res = CreateSession( KDMDEVDIALOGSERVER,TVersion(KDmDevDialogServerVersionMajor,
+		        KDmDevDialogServerVersionMinor,0),KDefaultMessageSlots );
+		if ( res != KErrNone )
+			{
+			FLOG(_L("RDmDevDialog::OpenL()- session not created"));
+			res = StartServerL();
+			User::LeaveIfError( res );
+			res = CreateSession( KDMDEVDIALOGSERVER,TVersion(KDmDevDialogServerVersionMajor,
+	                KDmDevDialogServerVersionMinor,0),KDefaultMessageSlots );
+			}							
+	FLOG(_L("RDmDevDialog::OpenL()- End %d"),res);	
+	return res;
+	}
+
+// ---------------------------------------------------------------------------
+// RDmDevDialog::Close()
+// ---------------------------------------------------------------------------
+EXPORT_C void RDmDevDialog::Close()
+	{
+    FLOG(_L(" RDmDevDialog::Close"));
+	RSessionBase::Close();
+	}
+	
+// ----------------------------------------------------------------------------
+// RDmDevDialog::LaunchPkgZeroL()
+// ----------------------------------------------------------------------------	
+EXPORT_C void RDmDevDialog::LaunchPkgZero(const TInt& aProfileId, 
+        const TInt& ajobId, const TInt& aUimode, 
+        TDes8& aResponse, TRequestStatus& aStatus )
+	{		
+    FLOG(_L(" RDmDevDialog::LaunchPkgZero--Begin"));
+    SendReceive( EServerAlert, TIpcArgs(aProfileId,ajobId,aUimode,&aResponse),
+            aStatus);
+    FLOG(_L(" RDmDevDialog::LaunchPkgZero end "));
+	}
+
+// ---------------------------------------------------------------------------
+// RDmDevDialog::IsPkgZeroConnectNoteShown() 
+// ---------------------------------------------------------------------------  
+EXPORT_C TInt RDmDevDialog::IsPkgZeroConnectNoteShown(TInt& aConectNoteShown)
+    {
+    FLOG(_L(" RDmDevDialog::IsPkgZeroConnectNoteShown--Begin"));
+    TPckgBuf<TInt> result(aConectNoteShown);
+    TInt err = SendReceive( EPkgConnectNoteIsActive,TIpcArgs(&result));    
+    aConectNoteShown = result();
+    FLOG(_L(" RDmDevDialog::IsPkgZeroConnectNoteShown--End as %d,%d"),err,
+            aConectNoteShown);
+    return err;    
+    }
+
+// ---------------------------------------------------------------------------
+// RDmDevDialog::DismissConnectDialog() 
+// --------------------------------------------------------------------------- 
+EXPORT_C TInt RDmDevDialog::DismissConnectDialog()
+    {
+    FLOG(_L(" RDmDevDialog::DismissConnectDialog--Begin"));    
+    TInt err = SendReceive( EPkgZeroConnectNoteDismiss,TIpcArgs());        
+    FLOG(_L(" RDmDevDialog::DismissConnectDialog--End as %d,%d"),err);    
+		return err;
+    }
+
+// ---------------------------------------------------------------------------
+// RDmDevDialog::ShowConnectDialog() 
+// --------------------------------------------------------------------------- 
+EXPORT_C TInt RDmDevDialog::ShowConnectDialog()
+    {
+    FLOG(_L(" RDmDevDialog::ShowConnectDialog--Begin"));    
+    TInt err = SendReceive( EPkgZeroConnectNoteShowAgain,TIpcArgs());        
+    FLOG(_L(" RDmDevDialog::ShowConnectDialog--error is %d"),err);
+    return err;    
+    }
+
+// ---------------------------------------------------------------------------
+// RDmDevDialog::ShowDisplayAlert() 
+// --------------------------------------------------------------------------- 
+EXPORT_C void RDmDevDialog::ShowDisplayAlert(const TDesC& aNoteDisplayText,
+            TRequestStatus& aStatus)
+    {
+    FLOG(_L(" RDmDevDialog::ShowDisplayAlert--Begin"));      
+    SendReceive( EShowDisplayAlert,TIpcArgs(&aNoteDisplayText),aStatus);        
+    FLOG(_L(" RDmDevDialog::ShowDisplayAlert end" ));
+    }
+
+
+// ---------------------------------------------------------------------------
+// RDmDevDialog::ShowConfirmationAlert() 
+// --------------------------------------------------------------------------- 
+EXPORT_C void RDmDevDialog::ShowConfirmationAlert(const TInt& aTimeout,
+        const TDesC& aNoteHeader, const TDesC& aNoteDisplayText, 
+        TRequestStatus& aStatus)
+    {
+    FLOG(_L(" RDmDevDialog::ShowConfirmationAlert--Begin"));
+    SendReceive( EShowConfirmationalert,TIpcArgs(aTimeout,&aNoteHeader,
+            &aNoteDisplayText),aStatus);
+    FLOG(_L(" RDmDevDialog::ShowConfirmationAlert--End "));    
+    }
+
+// ---------------------------------------------------------------------------
+// RDmDevDialog::CancelPkgZeroNote() 
+// --------------------------------------------------------------------------- 
+EXPORT_C TInt RDmDevDialog::CancelPkgZeroNote()
+    {
+    FLOG(_L(" RDmDevDialog::CancelPkgZeroNote--Begin"));
+    TInt err = SendReceive(ECancelServerAlert, TIpcArgs());    
+    FLOG(_L(" RDmDevDialog::CancelPkgZeroNote--End "));    
+    return err;
+    }
+
+//End of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/devicemgmtnotifications/dmdevdialogserver/bld/bld.inf	Tue Jul 13 09:51:41 2010 +0530
@@ -0,0 +1,27 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Implementation of DM Device Dialogs
+* 	This is part of syncmlfw.
+*
+*/
+
+// BLD.INF
+// Component description file 
+//
+
+PRJ_MMPFILES
+
+dmdevicedialog.mmp
+
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/devicemgmtnotifications/dmdevdialogserver/bld/dmdevicedialog.mmp	Tue Jul 13 09:51:41 2010 +0530
@@ -0,0 +1,48 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Implementation of DM Device Dialogs
+*
+*/
+
+#include <platform_paths.hrh>
+#include <defaultcaps.hrh>
+
+
+CAPABILITY    CAP_SERVER
+
+TARGET        dmdevicedialog.exe
+TARGETTYPE    exe
+
+UID 0 0x2002FF68
+VENDORID 			VID_DEFAULT
+
+SOURCEPATH    ../src
+SOURCE		  dmdevicedialogserver.cpp
+SOURCE		  dmdevicedialogsession.cpp 
+
+USERINCLUDE   ../inc
+USERINCLUDE   ../../inc
+USERINCLUDE   ../../cenrep
+
+MW_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE		/epoc32/include/mw/hb/hbcore 
+
+LIBRARY       euser.lib
+LIBRARY       efsrv.lib 
+LIBRARY       hbcore.lib
+LIBRARY 	  syncmlclientapi.lib
+LIBRARY 	  centralrepository.lib
+DEBUGLIBRARY  flogger.lib 
+
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/devicemgmtnotifications/dmdevdialogserver/inc/dmdevicedialogdebug.h	Tue Jul 13 09:51:41 2010 +0530
@@ -0,0 +1,67 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Implementation of DM Device Dialogs
+*/
+
+#ifndef __DMDEVDEBUG_H_
+#define __DMDEVDEBUG_H_
+#include <e32debug.h>
+#if 0
+#ifdef _DEBUG
+	#define _DMDEV_DEBUG
+#endif
+
+   #ifdef _DMDEV_DEBUG
+
+        #include <e32std.h>
+        #include <f32file.h>
+        #include <flogger.h>
+        #include <e32svr.h>
+
+        _LIT( KLogFile, "dmdevdialog.log" );
+        _LIT( KLogDirFullName, "c:\\logs\\" );
+        _LIT( KLogDir, "Dmdd" );
+
+        inline void FWrite (TRefByValue<const TDesC> aFmt,...)
+            {
+            VA_LIST list;
+            VA_START( list, aFmt );
+            RFileLogger::WriteFormat( KLogDir,KLogFile,EFileLoggingModeAppend ,TPtrC(aFmt) ,list );
+            }
+
+
+        #ifdef _DMDEV_DEBUG_RDEBUG 
+            #ifndef __GNUC__          
+                #define FLOG            RDebug::Print
+            #else   // __GNUC__       
+                #define FLOG(arg...)    RDebug::Print(arg);
+            #endif // __GNUC__        
+        #else // _DMDEV_DEBUG_RDEBUG
+            #ifndef __GNUC__          
+                #define FLOG            FWrite
+            #else   // __GNUC__       
+                #define FLOG(arg...)    FWrite(arg);
+            #endif // __GNUC__        
+        #endif // _DMDEV_DEBUG_RDEBUG
+
+    #else   // _DMDEV_DEBUG    
+        #ifndef __GNUC__
+            #define FLOG
+        #else
+            #define FLOG(arg...)
+        #endif // __GNUC__
+    #endif // _DMDEV_DEBUG
+#endif
+#define FLOG(arg...)    RDebug::Print(arg);
+#endif /*DMDEVDEBUG_H_*/

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/devicemgmtnotifications/dmdevdialogserver/inc/dmdevicedialogserver.h	Tue Jul 13 09:51:41 2010 +0530
@@ -0,0 +1,345 @@
+/*
+ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+* Description: Implementation of DM Device Dialogs
+ */
+
+#ifndef __DMDEVDIALOGSERVER_H__
+#define __DMDEVDIALOGSERVER_H__
+
+#include <e32base.h>
+#include <e32std.h>
+#include <hbdevicedialogsymbian.h>
+#include <hbindicatorsymbian.h>
+#include <hbsymbianvariant.h>
+#include <SyncMLObservers.h>
+#include <SyncMLClient.h>
+#include <SyncMLClientDM.h>
+#include "dmdevdialogclientserver.h"
+#include "dmdevicedialogdebug.h"
+
+class CDmDeviceDialogSession;
+class CDmDeviceDialogServer;
+class CHbIndicatorSymbian;
+
+
+_LIT(KDeviceDialogType,"com.nokia.hb.devicemanagementdialog/1.0");
+_LIT(KNotifierType, "syncmlfw");
+_LIT(KProfileId, "profileid");
+_LIT(KUImode, "uimode");
+_LIT(KServerdisplayname, "serverdisplayname");
+_LIT(KDMJobId, "jobid");
+_LIT(KServerpushalertInfo, "serverpushinformative");
+_LIT(KServerpushalertConfirm, "serverpushconfirmative");
+_LIT(KDMProgressIndicatorType, "com.nokia.devicemanagement.progressindicatorplugin/1.0");
+_LIT(KFotaDefaultProfile, "fotadefaultprofile");
+_LIT(KPkgZeroTimeout, "pkgzerotimeout");
+
+
+const TInt KRequestTriggerWaitTime(1000000);
+
+const TInt KDefaultNotifierId = 1000000;
+const TInt KConnectNotifierId = 1000001;
+// Device manager key UID
+const TUid KCRUidNSmlDMSyncApp = {0x101f6de5};
+// CenRep keys for default dm profile used in the
+// firmware update over the air.
+const TUint32 KNSmlDMDefaultFotaProfileKey = 0x00000002;
+
+#define KSosServerUid   0x101f99fb
+#define KFotaServerUid  0x102072C4
+#define KScomoServerUid 0x200267FB
+
+
+
+class CDmDeviceDialogServer : public CServer2,
+        public MHbDeviceDialogObserver,
+        public MSyncMLEventObserver,
+        public MHbIndicatorSymbianObserver
+    {
+    friend class CDmDeviceDialogSession;
+
+public:
+    enum TNoteType
+        {
+        EPkgZeroNote,
+        EConnectNote,
+        EInformativeAlertNote,
+        EConfirmationAlertNote
+        };
+    
+    enum TSyncMLSANSupport
+        {
+        ESANNotSpecified,
+        ESANSilent,
+        ESANUserInformative,
+        ESANUserInteractive
+        };
+    /**
+     * Destructor
+     */
+    virtual ~CDmDeviceDialogServer();
+
+    /**
+     * Static method which creates the server instance
+     * @param None
+     * @return CServer2*
+     */
+    static CServer2* NewLC();
+
+    /**
+     * Stops the session and closes the server
+     * @param None
+     * @return None
+     */
+    void CloseServer();
+
+    /**
+     * For asynchronous network request to be 
+     * logged on active object, using CPeriodic
+     * @param None
+     * @return None
+     */
+     void PeriodicServerCloseL();
+    
+    /**
+     * Launches package zero device dialog
+     * @param aProfileId, ProfileId of the DM server
+     * @param ajobId, Id of the DM job created due to package zero
+     * @param aUimode, Server alert ui mode type
+     * @param aReplySlot, Response to Sos server
+     * @param aMessage, reference to RMessage2 of current session.
+     * @return None.
+     */
+    void LaunchPkgZeroNoteL(TInt &aProfileId, TInt &aJobId,
+                    const TInt &aReplySlot, TInt &aUimode,
+                    const RMessage2& aMessage);
+    
+    /**
+     * Launches display alert specific device dialog
+     * @param aAlertText, Text to be dsiplayed on display alert     
+     * @param aMessage, reference to RMessage2 of current session.
+     * @return None.
+     */   
+    void ShowDisplayalertL(const TDesC &aAlertText,
+                    const RMessage2& aMessage);
+    
+    /**
+     * Launches Confirmation(1101) alert dialog
+     * @param aTimeout, Timeout of the dialog. 
+     * @param aNoteDisplayText, Text to be displayed on the note           
+     * @param aNoteHeader, Text to be displayed as dialog header  
+     * @param aMessage, reference to RMessage2 of current session.       
+     * @return None.        
+     */   
+    void ShowConfirmationalertL(const TInt& aTimeOut, const TDesC& aHeader,
+            const TDesC& aText, const RMessage2& aMessage);
+    
+    /**
+     * Keeps track of number of asynchronous requests
+     * @param None.      
+     * @return None.        
+     */    
+    void NewAsyncRequest();
+    
+    /**
+     * Tells any request pending or not
+     * @param None.      
+     * @return None.        
+     */    
+    TBool RequestPending();
+    
+    /**
+     * Cancels the earlier requested server shutdown
+     * annd serves for the incoming request.
+     * @param None.      
+     * @return None.        
+     */
+    void CancelServerCloseRequest(); 
+    
+    /**
+     * Callback method from Device dialog plugin for user action.
+     * @param aData, User response to the device dialog note            
+     * @return None.        
+     */   
+    virtual void DataReceived(CHbSymbianVariantMap& aData);
+
+    /**
+     * Callback method from Device dialog plugin when dialog gets closed.
+     * @param aCompletionCode, Error code.            
+     * @return None.        
+     */    
+    virtual void DeviceDialogClosed(TInt aCompletionCode);
+
+    /**
+    * From MSyncMLEventObserver
+    * Called when SyncML session events oocur.
+    * @param aEvent Sync event
+    * @param aIdentifier Identifier for the sync event
+    * @param aError Synce event error
+    * @param aAdditionalData.
+    * @return None.
+    */    
+    virtual void OnSyncMLSessionEvent(TEvent aEvent, TInt aIdentifier,
+            TInt aError, TInt aAdditionalData);
+    
+    /**
+     * Tells whether package zero query is currently shown or not.
+     * @param None.            
+     * @return TBool, status of package zero note display.        
+     */
+    TBool IsPkgZeroNoteDisplaying();
+    
+    /**
+     * Cancels outstanding package zero request.
+     * @param None.            
+     * @return None.        
+     */
+    void CancelPendingServerAlert();
+    
+    /**
+     * Callback method from Device dialog Indicator when user taps on Indicator.
+     * @param aType - Type of the indicator that user interacted with.
+     * @param aData - Data sent by the indicator.               
+     * @return None.        
+     */    
+    virtual void  IndicatorUserActivated (const TDesC &aType,
+                        CHbSymbianVariantMap &aData); 
+
+private:
+
+    /**
+     * second phase constructor
+     * @param None
+     */
+    void ConstructL();
+
+    /**
+     * Default constructor
+     * @param None
+     */
+    CDmDeviceDialogServer();
+
+    /**
+    * Called to close the server.
+    * @param None.    
+    * @return None.
+    */    
+    void StopServer();
+    
+    /**    
+    * Dsimisses the Connect device dialog
+    * @param None.
+    * @return None.
+    */     
+    void DismissDialog();
+    
+    /**
+    * Starts DM Job after user accepted the package zero message.
+    * @param None.
+    * @return None.
+    */     
+    void GetDMJobStatusL();
+    
+    /**
+     * Tells whether connect dialog is currently shown or not.
+     * @param None.
+     * @return boolean, status of the connect dialog.
+     */
+    TBool IsConenctDialogDisplaying();
+    
+    /**
+    * Display connect dialog, if dismissed earlier.
+    * @param None.
+    * @return None.
+    */     
+    void ShowConnectDialogAgainL();
+    
+    /**
+    * Called to process the response of user action on specified Device dialog
+    * @param aData, User response to the device dialog note           
+    * @return None.
+    */     
+    void DevDialogResponseL(CHbSymbianVariantMap& aData);
+    
+protected:
+
+    /**
+     * Calls when a New session is getting created
+     * @param aVersion
+     * @param aMessage
+     * @return CSession2*
+     */
+    CSession2* NewSessionL(const TVersion& aVersion,
+            const RMessage2& aMessage) const;
+
+private:
+    //Periodic timer used while shutting down the server
+    CPeriodic* iServerCloseRequest;
+
+    //DM Server Profile Id
+    TInt iProfileId;
+
+    //Current Dm Session Job Id
+    TInt iJobId;
+    
+    //Server alert type of package zero message
+    TUint iUimode;
+    
+    //Pointer to Device dialog server
+    CHbDeviceDialogSymbian* iDevDialog;
+    
+    //Reference to Indicator framework
+    CHbIndicatorSymbian* iDmIndicator;
+    
+    //Status variable to identify the status of Connecting note
+    TBool iPkgZeroConnectionNoteShown;
+    
+    //User response of device dialog note
+    TInt iResponse;
+
+    //RMessage reference used to notify the caller
+    RMessage2 iMessage;
+    
+    //Status variable to know whether server can be stopped or not
+    TBool iStopServer;
+    
+    // SyncML Session
+    RSyncMLSession iSyncMLSession;
+
+    // Job id after starting DM Job
+    TInt iSyncJobId;
+
+    // DM job
+    RSyncMLDevManJob iSyncJob;    
+    
+    //Status variable to know whether a DM Job is ongoing or not
+    TBool iJobongoing;
+    
+    //Status variable to know currently any device dialog is displayed or not
+    TBool iAnyDialogDisplaying;
+    
+    //Status variable to know whether an Indicator is launched or not
+    TBool iIndicatorLaunched;
+    
+    //Identifies the number of requests pending
+    TInt iSessionCount; 
+    
+    //Identifies whether package zero note is displaying or not
+    TBool iPkgZeroQueryNoteDisplaying;
+    
+	//Response slot to write the result
+    TInt iReplySlot;
+    };
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/devicemgmtnotifications/dmdevdialogserver/inc/dmdevicedialogsession.h	Tue Jul 13 09:51:41 2010 +0530
@@ -0,0 +1,79 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Implementation of DM Device Dialogs
+* 	This is part of syncmlfw.
+*/
+
+#ifndef __DMDEVDIALOG_SESSION_H__
+#define __DMDEVDIALOG_SESSION_H__
+
+#include "dmdevicedialogserver.h"
+
+class CDmDeviceDialogSession: public CSession2
+{
+	friend class CDmDeviceDialogServer;
+	public:
+		/**
+		 * Destructor
+		 */
+		virtual ~CDmDeviceDialogSession();
+						
+	private:
+		/**
+		 * Constructor
+		 */ 
+		CDmDeviceDialogSession();
+		
+		/**
+		 * Provides DM Device dialog Server reference
+		 * @param None.
+		 * @return CDmDeviceDialogServer reference
+		 */ 
+		CDmDeviceDialogServer& Server();
+		
+		/**
+		 * Called by the framework to handle the request 	 
+		 * @param aMessage
+		 * @return None
+		 */
+		void ServiceL(const RMessage2& aMessage);
+		
+		/**
+		 * Called from ServiceL to handle the request 
+		 * @param aMessage
+		 * @return None
+		 */
+		void DispatchMessageL(const RMessage2& aMessage);
+		
+		/**
+		 * Called when ServiceL leaves
+		 * @param aMessage
+		 * @param aError
+		 * @return None
+		 */
+		void ServiceError(const RMessage2 &aMessage, TInt aError);
+		
+		/**
+		 * Checks whether the session started client is secured or not	 
+		 * @param aMessage
+		 * @return TBool
+		 */
+		TBool CheckClientSecureId( const RMessage2 &aMessage );		
+		
+	private:			
+		RMessage2 iMessage;		 		
+};
+
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/devicemgmtnotifications/dmdevdialogserver/src/dmdevicedialogserver.cpp	Tue Jul 13 09:51:41 2010 +0530
@@ -0,0 +1,755 @@
+/*
+ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: Implementation of DM Device Dialogs
+ *
+ */
+
+#include <hbtextresolversymbian.h>
+#include <centralrepository.h>
+#include <DevManInternalCRKeys.h>
+#include "dmdevicedialogserver.h"
+#include "dmdevdialogclientserver.h"
+#include "dmdevicedialogsession.h"
+//#include <devicedialogconsts.h>
+// ----------------------------------------------------------------------------------------
+// Server startup code
+// ----------------------------------------------------------------------------------------
+static void RunServerL()
+    {
+    // naming the server thread after the server helps to debug panics
+    User::LeaveIfError(User::RenameThread(KDMDEVDIALOGSERVER));
+
+    // create and install the active scheduler
+    CActiveScheduler* s = new (ELeave) CActiveScheduler;
+    CleanupStack::PushL(s);
+    CActiveScheduler::Install(s);
+
+    // create the server (leave it on the cleanup stack)
+    CDmDeviceDialogServer::NewLC();
+
+    // Initialisation complete, now signal the client
+    RProcess::Rendezvous(KErrNone);
+
+    // Ready to run
+    CActiveScheduler::Start();
+
+    // Cleanup the server and scheduler
+    CleanupStack::PopAndDestroy(2);
+    }
+
+// ----------------------------------------------------------------------------------------
+// static method ShutDownL() called to submit async n/w request
+// ----------------------------------------------------------------------------------------
+static TInt ShutDownL(TAny* aPtr)
+    {
+    CDmDeviceDialogServer* ptr = (CDmDeviceDialogServer*) aPtr;
+    FLOG(_L("static ShutDownL:-Begin"));
+    TRAPD(err, ptr->CloseServer());
+    FLOG(_L("closing the server"));
+    ptr->CancelServerCloseRequest();
+    FLOG(_L("closing the server:-end"));
+    return err;
+    }
+
+// ----------------------------------------------------------------------------------------
+// Server process entry-point
+// ----------------------------------------------------------------------------------------
+TInt E32Main()
+    {
+    __UHEAP_MARK;
+    CTrapCleanup* cleanup = CTrapCleanup::New();
+    TInt r = KErrNoMemory;
+    if (cleanup)
+        {
+        TRAP(r,RunServerL());
+        delete cleanup;
+        }
+    __UHEAP_MARKEND;
+    return r;
+    }
+
+// ----------------------------------------------------------------------------------------
+// CDmDeviceDialogServer::NewLC
+// ----------------------------------------------------------------------------------------
+CServer2* CDmDeviceDialogServer::NewLC()
+    {
+    CDmDeviceDialogServer* self = new (ELeave) CDmDeviceDialogServer;
+    CleanupStack::PushL(self);
+    self->ConstructL();
+    return self;
+    }
+
+// ----------------------------------------------------------------------------------------
+// CDmDeviceDialogServer::ConstructL
+// ----------------------------------------------------------------------------------------
+void CDmDeviceDialogServer::ConstructL()
+    {
+    FLOG(_L("CDmDeviceDialogServer::ConstructL- begin"));
+    StartL( KDMDEVDIALOGSERVER);    
+    iSyncMLSession.OpenL();
+    FLOG(_L("CDmDeviceDialogServer::ConstructL- end"));
+    }
+
+// ----------------------------------------------------------------------------------------
+// CDmDeviceDialogServer::CDmDeviceDialogServer() 
+// ----------------------------------------------------------------------------------------
+CDmDeviceDialogServer::CDmDeviceDialogServer() :
+    CServer2(EPriorityStandard, EUnsharableSessions)
+    {
+    iSessionCount = 0;
+    iServerCloseRequest = NULL;
+    iProfileId = EFalse;
+    iJobId = EFalse;
+    iStopServer = EFalse;
+    iResponse = -1;
+    iPkgZeroConnectionNoteShown = EFalse;
+    iDmIndicator = NULL;
+    iDevDialog = NULL;
+    iAnyDialogDisplaying = EFalse;
+    iIndicatorLaunched = EFalse;
+    iPkgZeroQueryNoteDisplaying = EFalse;
+    }
+
+// -----------------------------------------------------------------------------
+// CDmDeviceDialogServer::CloseServer()
+// -----------------------------------------------------------------------------
+void CDmDeviceDialogServer::CloseServer()
+    {
+    iSessionCount = 0;
+    //Kill the server
+    CActiveScheduler::Stop();
+    }
+
+// -----------------------------------------------------------------------------
+// CDmDeviceDialogServer::DataReceived()
+// -----------------------------------------------------------------------------
+void CDmDeviceDialogServer::DataReceived(CHbSymbianVariantMap& aData)
+    {
+    FLOG(_L("CDmDeviceDialogServer::DataReceived>>"));
+    TRAP_IGNORE(DevDialogResponseL(aData));
+    FLOG(_L("CDmDeviceDialogServer::DataReceived<<"));
+    }
+
+// -----------------------------------------------------------------------------
+// CDmDeviceDialogServer::DevDialogResponseL()
+// -----------------------------------------------------------------------------
+void CDmDeviceDialogServer::DevDialogResponseL(CHbSymbianVariantMap& aData)
+    {
+    FLOG(_L("CDmDeviceDialogServer::DevDialogResponseL>>"));
+    _LIT(KNotifierReturnType, "notifiertype");
+    _LIT(KKeyPress, "keypress");
+    const CHbSymbianVariant* notifiertypevariant = aData.Get(KNotifierReturnType);    
+    TInt *notifiertype = notifiertypevariant->Value<TInt> ();
+    const CHbSymbianVariant* returnkeyvariant = aData.Get(KKeyPress);    
+    TInt *returnvalue = returnkeyvariant->Value<TInt> ();   
+    iResponse = *returnvalue;
+    iDevDialog->Cancel();
+    iAnyDialogDisplaying = EFalse;
+    if (EPkgZeroNote == *notifiertype )//Server alert note
+        {
+        FLOG(_L("CDmDeviceDialogServer::DevDialogResponseL EPkgZeroNote \
+                response from user is %d"),iResponse);
+        if (iResponse == 0)
+            {
+            FLOG(_L("CDmDeviceDialogServer::DevDialogResponseL OK pressed"));
+            CHbSymbianVariantMap* varMap = CHbSymbianVariantMap::NewL();
+            CleanupStack::PushL(varMap);            
+            TInt id = KConnectNotifierId;
+            HBufC* notifierid = HBufC::NewL(10);
+            CleanupStack::PushL(notifierid);            
+            *notifierid = KNotifierType;
+            CHbSymbianVariant* notifieridvar = CHbSymbianVariant::NewL(&id,
+                    CHbSymbianVariant::EInt);            
+            varMap->Add(*notifierid, notifieridvar);
+            TInt err = iDevDialog->Show(KDeviceDialogType, *varMap, this);
+            FLOG(_L("CDmDeviceDialogServer::DevDialogResponseLconnect note \
+                    launch error is %d"), err);
+            iAnyDialogDisplaying = ETrue;
+            iPkgZeroConnectionNoteShown = ETrue;
+            GetDMJobStatusL();
+            TPckgBuf<TInt> response(KDmDevDialogUid);
+            iMessage.WriteL(iReplySlot,response);
+            iMessage.Complete(KErrNone);
+            iSessionCount--;
+            CleanupStack::PopAndDestroy(2);
+            //GetDMJobStatusL();
+            FLOG(_L("CDmDeviceDialogServer::DevDialogResponseL DM Job \
+                     started"));
+            }
+        else
+            {
+            FLOG(_L("CDmDeviceDialogServer::DevDialogResponseL user pressed \
+                     cancel"));
+            iMessage.Complete(KErrCancel);
+            iSessionCount--;            
+            StopServer();
+            FLOG(_L("CDmDeviceDialogServer::DevDialogResponseL stop \
+                     server called"));
+            }
+        iPkgZeroQueryNoteDisplaying = EFalse;
+        }
+    else if (EInformativeAlertNote == *notifiertype )// Iformative alert
+        {
+        FLOG(_L("CDmDeviceDialogServer::DevDialogResponseL informative alert"));
+        iMessage.Complete(KErrNone);
+        iSessionCount--;
+        if (!iJobongoing)
+            StopServer();
+        else
+            ShowConnectDialogAgainL();
+        }
+    else if (EConfirmationAlertNote == *notifiertype)// conformative alert
+        {
+        FLOG(_L("CDmDeviceDialogServer::DevDialogResponseL conformative alert"));
+        iMessage.Complete(iResponse);
+        iSessionCount--;
+        if (!iJobongoing)
+            StopServer();
+        else
+            ShowConnectDialogAgainL();
+        }
+    else //connecting note
+        {
+        iPkgZeroConnectionNoteShown = EFalse;
+        FLOG(_L("CDmDeviceDialogServer::DevDialogResponseL connecting note"));
+        if (iResponse == KErrCancel)
+            {
+            FLOG(_L("CDmDeviceDialogServer::DevDialogResponseL user cancelled \
+                     connection"));
+            if (iJobongoing)
+                {
+                FLOG(_L("CDmDeviceDialogServer::DevDialogResponseL job stop \
+                         requested"));
+                iSyncJob.StopL();
+                FLOG(_L("CDmDeviceDialogServer::DevDialogResponseL job stop\
+                         done"));
+                }
+            DismissDialog();                               
+            StopServer();
+            FLOG(_L("CDmDeviceDialogServer::DevDialogResponseL connecting note \
+                     stopserver called"));
+            }
+        else // Launch indicator
+            {
+            FLOG(_L("CDmDeviceDialogServer::DevDialogResponseL Launch \
+                    Indicator"));            
+            //Send the text id
+			_LIT(KFileName, "deviceupdates_");
+			_LIT(KPath, "z:/resource/qt/translations/"); 
+			TBool result = HbTextResolverSymbian::Init(KFileName, KPath);
+    		if(result)
+    			{
+    		    if(iDmIndicator == NULL)
+				iDmIndicator = CHbIndicatorSymbian::NewL();
+				_LIT(KIndicatorTest, 
+				    "txt_deviceupdate_dblist_device_updates_val_connect_fota");       
+				// returns the string "Text test"
+				HBufC* text = HbTextResolverSymbian::LoadL(KIndicatorTest);
+    			CleanupStack::PushL(text);
+    			TPtr textptr = text->Des();
+				CHbSymbianVariant* IndicatorText = CHbSymbianVariant::NewL(
+									&textptr, CHbSymbianVariant::EDes);
+				CleanupStack::PushL(IndicatorText);	       
+				FLOG(_L("CDmDeviceDialogServer::DevDialogResponseL Indicator activated")); 
+				iDmIndicator->SetObserver(this);
+				FLOG(_L("CDmDeviceDialogServer::DevDialogResponseL indicator Observer set"));
+				iDmIndicator->Activate(KDMProgressIndicatorType,IndicatorText);
+				
+				iIndicatorLaunched = ETrue;
+				CleanupStack::PopAndDestroy(2);  
+				}
+            }
+        }
+    FLOG(_L("CDmDeviceDialogServer::DevDialogResponseL End"));    
+    }
+
+// -----------------------------------------------------------------------------
+// CDmDeviceDialogServer::DeviceDialogClosed()
+// -----------------------------------------------------------------------------
+void CDmDeviceDialogServer::DeviceDialogClosed(TInt /*aError*/)
+    {
+    FLOG(_L("CDmDeviceDialogServer::DeviceDialogClosed "));
+    }
+
+// ----------------------------------------------------------------------------------------
+// CDmDeviceDialogServer::~CDmDeviceDialogServer() 
+// ----------------------------------------------------------------------------------------
+CDmDeviceDialogServer::~CDmDeviceDialogServer()
+    {
+    FLOG(_L("CDmDeviceDialogServer::~CDmDeviceDialogServer()"));
+    if (iServerCloseRequest)
+        {
+        FLOG(_L("CDmDeviceDialogServer::~CDmDeviceDialogServer() \
+                iServerCloseRequest cancel)"));
+        iServerCloseRequest->Cancel();
+        delete iServerCloseRequest;
+        iServerCloseRequest = NULL;
+        }
+    if (iDevDialog)
+        {
+        FLOG(_L("CDmDeviceDialogServer::~CDmDeviceDialogServer():if loop)"));
+        iDevDialog->Cancel();
+        delete iDevDialog;
+        }
+    if (iDmIndicator)
+        {
+        iDmIndicator->Deactivate(KDMProgressIndicatorType);
+        delete iDmIndicator;
+        }
+    FLOG(_L("CDmDeviceDialogServer::~CDmDeviceDialogServer()job to close"));
+    if(iJobongoing)
+        iSyncJob.Close();
+    iSyncMLSession.Close();
+    FLOG(_L("CDmDeviceDialogServer::~CDmDeviceDialogServer() end"));
+    }
+
+// ----------------------------------------------------------------------------------------
+// CDmDeviceDialogServer::NewSessionL() 
+// ----------------------------------------------------------------------------------------
+CSession2* CDmDeviceDialogServer::NewSessionL(const TVersion&,
+        const RMessage2&) const
+    {
+    return new (ELeave) CDmDeviceDialogSession();
+    }
+
+// ----------------------------------------------------------------------------
+// CDmDeviceDialogServer::PeriodicServerCloseL() 
+// ----------------------------------------------------------------------------
+void CDmDeviceDialogServer::PeriodicServerCloseL()
+    {
+    if (iServerCloseRequest)
+        {
+        FLOG(_L("CDmDeviceDialogServer::PeriodicServerCloseL() \
+                :-iServerCloseRequest cancel "));
+        iServerCloseRequest->Cancel();
+        delete iServerCloseRequest;
+        iServerCloseRequest = NULL;
+        }
+    iServerCloseRequest = CPeriodic::NewL(EPriorityNormal);    
+    iServerCloseRequest->Start(TTimeIntervalMicroSeconds32(
+            KRequestTriggerWaitTime * 5), TTimeIntervalMicroSeconds32(
+            KRequestTriggerWaitTime * 5), TCallBack(ShutDownL, this));
+    FLOG(_L("CDmDeviceDialogServer::PeriodicServerCloseL():-Request logged)"));
+    }
+
+// -----------------------------------------------------------------------------
+// CDmDeviceDialogServer::LaunchPkgZeroNoteL()
+// -----------------------------------------------------------------------------
+void CDmDeviceDialogServer::LaunchPkgZeroNoteL(TInt &aProfileId,
+        TInt &aJobId, const TInt &aReplySlot, TInt &aUimode,
+        const RMessage2& aMessage)
+    {
+    FLOG(_L("CDmDeviceDialogSession::LaunchPkgZeroNoteL \
+             called:"));
+    iProfileId = aProfileId;
+    iReplySlot = aReplySlot;
+    iJobId = aJobId;
+    iUimode = aUimode;
+    iMessage = aMessage;
+    CHbSymbianVariantMap* varMap = CHbSymbianVariantMap::NewL();
+    CleanupStack::PushL(varMap);
+
+    HBufC* notifierid = HBufC::NewL(10);
+    CleanupStack::PushL(notifierid);
+    *notifierid = KNotifierType;
+
+    HBufC* profileid = HBufC::NewL(10);
+    CleanupStack::PushL(profileid);
+    *profileid = KProfileId;
+
+    HBufC* uimode = HBufC::NewL(10);
+    CleanupStack::PushL(uimode);
+    *uimode = KUImode;
+
+    HBufC* serverdisplay = HBufC::NewL(20);
+    CleanupStack::PushL(serverdisplay);
+    *serverdisplay = KServerdisplayname;
+    
+    HBufC* defaultprofile = HBufC::NewL(20);
+    CleanupStack::PushL(defaultprofile);
+    *defaultprofile = KFotaDefaultProfile;
+    
+    HBufC* timeout = HBufC::NewL(20);
+    CleanupStack::PushL(timeout);
+    *timeout = KPkgZeroTimeout;
+    
+    TInt profileId( KErrNotFound );
+    TBool Isdefault = EFalse;
+    CRepository* centrep = NULL;
+    TRAPD( err, centrep = CRepository::NewL( KCRUidNSmlDMSyncApp ) );
+    if (err == KErrNone)
+        {
+        centrep->Get(KNSmlDMDefaultFotaProfileKey, profileId);
+        delete centrep;
+        centrep = NULL;
+        if (aProfileId == profileId)
+            Isdefault = ETrue;
+        }
+    TRAP( err, centrep = CRepository::NewL( KCRUidDeviceManagementInternalKeys) );
+    TInt Timeout(KErrNone);
+    if (err == KErrNone)
+        {
+        centrep->Get(KDevManServerAlertTimeout, Timeout);
+        //Timeout has minutes, convert to milli second
+        Timeout = Timeout * 60 * 1000;
+        delete centrep;
+        centrep = NULL;        
+        }
+    
+    TInt id = KDefaultNotifierId;
+    CHbSymbianVariant* notifieridvar = CHbSymbianVariant::NewL(&id,
+            CHbSymbianVariant::EInt);
+    CleanupStack::PushL(notifieridvar);
+    CHbSymbianVariant* infoprofileid = CHbSymbianVariant::NewL(&iProfileId,
+            CHbSymbianVariant::EInt);
+    CleanupStack::PushL(infoprofileid);
+    CHbSymbianVariant* infouimode = CHbSymbianVariant::NewL(&iUimode,
+            CHbSymbianVariant::EInt);
+    CleanupStack::PushL(infouimode);
+    RSyncMLDevManProfile DmProfile;
+    DmProfile.OpenL( iSyncMLSession, iProfileId, ESmlOpenRead );
+    TBuf<256> servername= DmProfile.DisplayName();                  
+    DmProfile.Close();
+    CHbSymbianVariant* serverdisplayname = CHbSymbianVariant::NewL(
+            &servername, CHbSymbianVariant::EDes);
+    CleanupStack::PushL(serverdisplayname);
+    CHbSymbianVariant* defaultprofilevalue = CHbSymbianVariant::NewL(
+            &Isdefault, CHbSymbianVariant::EBool);
+    CleanupStack::PushL(defaultprofilevalue);
+    
+    CHbSymbianVariant* pkgzerotimeout = CHbSymbianVariant::NewL(
+                &Timeout, CHbSymbianVariant::EInt);
+        CleanupStack::PushL(pkgzerotimeout);
+    
+    varMap->Add(*notifierid, notifieridvar);
+    varMap->Add(*profileid, infoprofileid);
+    varMap->Add(*uimode, infouimode);
+    varMap->Add(*serverdisplay, serverdisplayname);
+    varMap->Add(*defaultprofile, defaultprofilevalue);
+    varMap->Add(*timeout, pkgzerotimeout);
+    CleanupStack::Pop(6);
+    if (iDevDialog == NULL)
+        iDevDialog = CHbDeviceDialogSymbian::NewL();
+    else if (iAnyDialogDisplaying)
+        {
+        iDevDialog->Cancel();
+        iAnyDialogDisplaying = EFalse;
+        }
+    else
+        {
+        }
+    err = 
+        iDevDialog->Show(KDeviceDialogType, *varMap, this);
+    iPkgZeroQueryNoteDisplaying = ETrue;
+    FLOG(_L("CDmDeviceDialogSession::LaunchPkgZeroNoteL \
+         err in devdialog is %d"), err);
+    iAnyDialogDisplaying = ETrue;
+    CleanupStack::PopAndDestroy(7);
+    FLOG(_L("CDmDeviceDialogSession::LaunchPkgZeroNoteL \
+                 end:"));
+    }
+
+// -----------------------------------------------------------------------------
+// CDmDeviceDialogServer::StopServer()
+// -----------------------------------------------------------------------------
+void CDmDeviceDialogServer::StopServer()
+    {
+    FLOG(_L("CDmDeviceDialogServer::StopServer Begin"));
+    if(!iStopServer && !iJobongoing)
+        {
+        iPkgZeroConnectionNoteShown = EFalse;
+        iStopServer = ETrue;
+        FLOG(_L("CDmDeviceDialogServer::StopServer Requested to shut down"));
+        TRAP_IGNORE(PeriodicServerCloseL());
+        }
+    FLOG(_L("CDmDeviceDialogServer::StopServer Done"));
+    }
+
+// -----------------------------------------------------------------------------
+// CDmDeviceDialogServer::OnSyncMLSessionEvent()
+// -----------------------------------------------------------------------------
+void CDmDeviceDialogServer::OnSyncMLSessionEvent(TEvent aEvent,
+        TInt aIdentifier, TInt aError, TInt /*aAdditionalData*/)
+    {
+    FLOG(_L("[OMADM]\tDmDeviceDialogServer::OnSyncMLSessionEvent(),\
+                     aEvent = %d, aIdentifier = %d, aError = %d"),
+            aEvent, aIdentifier, aError);
+    if (iSyncJobId == aIdentifier && (aEvent == EJobStop || aEvent
+            == EJobStartFailed || aEvent == EJobRejected))
+        {
+        FLOG(_L("[OMADM]\tDmDeviceDialogServer::OnSyncMLSessionEvent(), \
+                        ajob stoping" ));
+        iSyncJob.Close();
+        iJobongoing = false;        
+        //Stop the dialog
+        DismissDialog();
+        StopServer();
+        }
+    FLOG(_L( "[OMADM]\tDmDeviceDialogServer::OnSyncMLSessionEvent()end" ));
+    }
+
+// -----------------------------------------------------------------------------
+// CDmDeviceDialogServer::DismissDialog()
+// -----------------------------------------------------------------------------
+void CDmDeviceDialogServer::DismissDialog()
+    {
+    FLOG(_L("CDmDeviceDialogServer::dismissDialog "));
+
+    if (iDevDialog && iPkgZeroConnectionNoteShown && !iIndicatorLaunched)
+        {
+        FLOG(_L("CDmDeviceDialogServer::dismissDialog 3"));
+        iDevDialog->Cancel();
+        iAnyDialogDisplaying = EFalse;
+        iPkgZeroConnectionNoteShown = EFalse;
+        }
+    if (iIndicatorLaunched)
+        {
+        FLOG(
+            _L("CDmDeviceDialogServer::dismissDialog deactivating indicator"));
+        iDmIndicator->Deactivate(KDMProgressIndicatorType);       
+        FLOG(
+           _L("CDmDeviceDialogServer::dismissDialog deactivating indicator done"));
+        iIndicatorLaunched = false;
+        }
+    }
+
+// -----------------------------------------------------------------------------
+// CDmDeviceDialogServer::GetDMJobStatusL()
+// -----------------------------------------------------------------------------
+void CDmDeviceDialogServer::GetDMJobStatusL()
+    {
+    FLOG(_L("CDmDeviceDialogServer::GetDMJobStatusL "));
+    iSyncJob.OpenL(iSyncMLSession, iJobId);
+    FLOG(_L("CDmDeviceDialogServer::GetDMJobStatusL Job started "));
+    iJobongoing = true;
+    iSyncJobId = iSyncJob.Identifier();
+    TInt err = KErrNone;
+    // for MSyncMLEventObserver events
+    TRAP( err, iSyncMLSession.RequestEventL(*this) );
+    FLOG(_L("CDmDeviceDialogServer::GetDMJobStatusL error %d"), err);
+    if (err != KErrNone)
+        {
+        iSyncJob.StopL();
+        iSyncJob.Close();
+        FLOG(_L("CDmDeviceDialogServer::GetDMJobStatusL leaving"));
+        User::Leave(err);
+        }    
+    FLOG(_L("CDmDeviceDialogServer::GetDMJobStatusL end "));
+    }
+
+// -----------------------------------------------------------------------------
+// CDmDeviceDialogServer::IsConenctDialogDisplaying()
+// -----------------------------------------------------------------------------
+TBool CDmDeviceDialogServer::IsConenctDialogDisplaying()
+    {
+    return iPkgZeroConnectionNoteShown;
+    }
+
+// -----------------------------------------------------------------------------
+// CDmDeviceDialogServer::ShowConnectDialogAgainL()
+// -----------------------------------------------------------------------------
+void CDmDeviceDialogServer::ShowConnectDialogAgainL()
+    {
+    if (iJobongoing && !iIndicatorLaunched && !iPkgZeroConnectionNoteShown)
+        {
+        FLOG(_L("CDmDeviceDialogServer::ShowConnectDialogAgain 1"));
+        CHbSymbianVariantMap* varMap = CHbSymbianVariantMap::NewL();
+        CleanupStack::PushL(varMap);
+        TInt id = KConnectNotifierId;
+        HBufC* notifierid = HBufC::NewL(10);
+        CleanupStack::PushL(notifierid);
+        FLOG(_L("CDmDeviceDialogServer::ShowConnectDialogAgain 2"));
+        *notifierid = KNotifierType;
+        CHbSymbianVariant* notifieridvar = CHbSymbianVariant::NewL(&id,
+                CHbSymbianVariant::EInt);
+        FLOG(_L("CDmDeviceDialogServer::ShowConnectDialogAgain 3"));
+        varMap->Add(*notifierid, notifieridvar);
+        FLOG(_L("CDmDeviceDialogServer::ShowConnectDialogAgain 4"));
+        if (iDevDialog == NULL)
+            {
+            iDevDialog = CHbDeviceDialogSymbian::NewL();
+            FLOG(_L("CDmDeviceDialogServer::ShowConnectDialogAgain 5"));
+            }
+        else if (iAnyDialogDisplaying)
+            iDevDialog->Cancel();
+        else
+            {
+            }
+        iDevDialog->Show(KDeviceDialogType, *varMap, this);
+        iAnyDialogDisplaying = ETrue;
+        FLOG(_L("CDmDeviceDialogServer::ShowConnectDialogAgain 6"));
+        iPkgZeroConnectionNoteShown = ETrue;
+        CleanupStack::PopAndDestroy(2);
+        }
+    }
+
+// -----------------------------------------------------------------------------
+// CDmDeviceDialogServer::ShowDisplayalertL()
+// -----------------------------------------------------------------------------
+void CDmDeviceDialogServer::ShowDisplayalertL(const TDesC& aAlertText,
+        const RMessage2& aMessage)
+    {
+    FLOG(_L("CDmDeviceDialogServer::ShowDisplayalert "));
+    iMessage = aMessage;
+    CHbSymbianVariantMap* varMap = CHbSymbianVariantMap::NewL();
+    CleanupStack::PushL(varMap);
+    HBufC* keyBuf = HBufC::NewL(25);
+    CleanupStack::PushL(keyBuf);
+    *keyBuf = KNotifierType;
+    HBufC* servalertType = HBufC::NewL(25);
+    CleanupStack::PushL(servalertType);
+    *servalertType = KServerpushalertInfo;
+    TInt id = 0;
+    CHbSymbianVariant* notifierid = CHbSymbianVariant::NewL(&id,
+            CHbSymbianVariant::EInt);
+    varMap->Add(*keyBuf, notifierid);
+    CHbSymbianVariant* serveralertmsg = CHbSymbianVariant::NewL(&aAlertText,
+            CHbSymbianVariant::EDes);
+    varMap->Add(*servalertType, serveralertmsg); // takes ownership
+    FLOG(_L("CDmDeviceDialogServer::ShowDisplayalert before newl"));
+    if (iDevDialog == NULL)
+        iDevDialog = CHbDeviceDialogSymbian::NewL();
+    else if (iAnyDialogDisplaying)
+        {
+        iDevDialog->Cancel();
+        }
+    else
+        {
+        }
+    FLOG(_L("CDmDeviceDialogServer::ShowDisplayalert before show"));
+    iDevDialog->Show(KDeviceDialogType, *varMap, this);
+    iAnyDialogDisplaying = ETrue;
+    CleanupStack::PopAndDestroy(3);
+    }
+
+// -----------------------------------------------------------------------------
+// CDmDeviceDialogServer::ShowConfirmationalertL()
+// -----------------------------------------------------------------------------
+void CDmDeviceDialogServer::ShowConfirmationalertL(const TInt& /*aTimeOut*/,
+        const TDesC& /*aHeader*/, const TDesC& aText, const RMessage2& aMessage)
+    {
+    iMessage = aMessage;
+    CHbSymbianVariantMap* varMap = CHbSymbianVariantMap::NewL();
+    CleanupStack::PushL(varMap);
+    HBufC* keyBuf = HBufC::NewL(25);
+    CleanupStack::PushL(keyBuf);
+    *keyBuf = KNotifierType;
+    HBufC* servalertType = HBufC::NewL(25);
+    CleanupStack::PushL(servalertType);
+    *servalertType = KServerpushalertConfirm;
+    TInt id = 0;
+    CHbSymbianVariant* notifierid = CHbSymbianVariant::NewL(&id,
+            CHbSymbianVariant::EInt);
+    varMap->Add(*keyBuf, notifierid);
+    CHbSymbianVariant* serveralertmsg = CHbSymbianVariant::NewL(&aText,
+            CHbSymbianVariant::EDes);    
+    varMap->Add(*servalertType, serveralertmsg); // takes ownership   
+    if (iDevDialog == NULL)
+        iDevDialog = CHbDeviceDialogSymbian::NewL();
+    else if (iAnyDialogDisplaying)
+        iDevDialog->Cancel();
+    else
+        {
+        }
+    iDevDialog->Show(KDeviceDialogType, *varMap, this);
+    iAnyDialogDisplaying = ETrue;
+    CleanupStack::PopAndDestroy(3);
+    }
+
+
+// ----------------------------------------------------------------------------------------
+// CDmDeviceDialogServer::NewAsyncRequest() 
+// ----------------------------------------------------------------------------------------
+void CDmDeviceDialogServer::NewAsyncRequest()
+    {
+    iSessionCount++;
+    }
+// ----------------------------------------------------------------------------------------
+// CDmDeviceDialogServer::RequestPending() 
+// Any request pending
+// ----------------------------------------------------------------------------------------
+TBool CDmDeviceDialogServer::RequestPending()
+    {
+    if( iSessionCount > 0 )
+        {
+        return ETrue;
+        }
+    return EFalse;
+    }
+
+// ----------------------------------------------------------------------------------------
+// CDmDeviceDialogServer::CancelServerCloseRequest() 
+// Cancels Server shutdown
+// ----------------------------------------------------------------------------------------	
+void CDmDeviceDialogServer::CancelServerCloseRequest()    
+	{
+	FLOG(_L("CDmDeviceDialogServer::CancelServerCloseRequest():-begin)"));
+	if(iServerCloseRequest)
+		{
+		FLOG(_L("CDmDeviceDialogServer::CancelServerCloseRequest():-iServerCloseRequest cancel)"));
+		iServerCloseRequest->Cancel();
+		delete iServerCloseRequest;
+		iServerCloseRequest = NULL;
+		}	
+	FLOG(_L("CDmDeviceDialogServer::CancelServerCloseRequest():-end)"));
+	}
+
+// ----------------------------------------------------------------------------------------
+// CDmDeviceDialogServer::IsPkgZeroNoteDisplaying() 
+// ---------------------------------------------------------------------------------------- 
+TBool CDmDeviceDialogServer::IsPkgZeroNoteDisplaying()    
+    {
+    FLOG(_L("CDmDeviceDialogServer::IsPkgZeroNoteDisplaying())"));
+    return iPkgZeroQueryNoteDisplaying;    
+    }
+
+// ----------------------------------------------------------------------------------------
+// CDmDeviceDialogServer::CancelPendingServerAlert() 
+// ----------------------------------------------------------------------------------------
+void CDmDeviceDialogServer::CancelPendingServerAlert()
+    {
+    FLOG(_L("CDmDeviceDialogServer::CancelPendingServerAlert())"));
+    if(IsPkgZeroNoteDisplaying())
+        {
+        iSessionCount--;
+        iDevDialog->Cancel();
+        iPkgZeroQueryNoteDisplaying = EFalse;
+        iMessage.Complete(KErrCancel);
+        FLOG(_L("CDmDeviceDialogServer::CancelPendingServerAlert() cancelled"));    
+        }
+    }
+
+// ----------------------------------------------------------------------------------------
+// CDmDeviceDialogServer::IndicatorUserActivated() 
+// ----------------------------------------------------------------------------------------
+void  CDmDeviceDialogServer::IndicatorUserActivated (const TDesC& /*aType*/,
+                        CHbSymbianVariantMap& /*aData*/)
+    {
+    //Deactivate the indicator done by plugin
+    FLOG(_L("CDmDeviceDialogServer::IndicatorUserActivated()"));
+    if (iDmIndicator)
+        {
+        //Indicator deactivated on plugin side
+        FLOG(_L("CDmDeviceDialogServer::IndicatorUserActivated() Indicator \
+                deactivated"));
+        iIndicatorLaunched = EFalse;
+        FLOG(_L("CDmDeviceDialogServer::IndicatorUserActivated() connect \
+                 dialog to be activated"));
+        TRAP_IGNORE(ShowConnectDialogAgainL());
+        FLOG(_L("CDmDeviceDialogServer::IndicatorUserActivated() connect \
+                         dialog activated"));
+        }
+    FLOG(_L("CDmDeviceDialogServer::IndicatorUserActivated() end"));
+    }
+//End of file