--- a/syncmlfw/common/sosserver/inc/nsmlsosthread.h	Thu Aug 19 10:44:50 2010 +0300
+++ b/syncmlfw/common/sosserver/inc/nsmlsosthread.h	Tue Aug 31 16:04:06 2010 +0300
@@ -19,10 +19,13 @@
 #ifndef __NSMLTHREADSTART_H__
 #define __NSMLTHREADSTART_H__
 
-#include <SyncMLNotifierParams.h>
-#include <SyncMLNotifier.h>
+#include <devicedialogsymbian.h>
+#include <dmdevdialogclient.h>
+#include <hbdevicedialogsymbian.h>
+#include <hbsymbianvariant.h>
 #include "nsmlsosserver.h"
 
+
 class CNSmlJob;
 class CNSmlNotifierObserver;
 class CNSmlNotifierTimeOut;
@@ -89,7 +92,7 @@
 		
 		void StartJobSessionL();
 		void CancelJob();
-		TInt VerifyJobFromNotifierL();
+		TInt VerifyJobFromNotifierL(TBool aServerInitiated);
 		
 		TInt FinishedStatus() 
 			{
@@ -122,14 +125,12 @@
 		
 		//used for server alert initiated job
 		RTimer iTimeout;
-    	RNotifier iNotifier;
+//    	RNotifier iNotifier;
     	CNSmlNotifierObserver* iNotifierObserver;
     	RLibrary iSessionLib;
     	CNSmlDMAgent* iDMAgent;		
 		CNSmlDSAgent* iDSAgent;	
 		CNSmlCancelTimeOut* iCancelTimeout;
-		// Fix for cancel not happening when cancel key is pressed 
-		TBool iSyncCancelled;
 	};
 
 
@@ -184,18 +185,26 @@
 		~CNSmlNotifierObserver();
 		void ConnectToNotifierL( const TSyncMLAppLaunchNotifParams& aParam );
 		void NotifierTimeOut();
+		TBool IsHbSyncmlNotifierEnabledL();
+		void HbNotifierObserverL(const TSyncMLAppLaunchNotifParams& aParam);
 	protected:
 		void DoCancel();
 		void RunL();
 	private:
 		TRequestStatus& iCallerStatus;
 		
-		RNotifier iNotifier;
-		TSyncMLAppLaunchNotifRetValPckg iResBuf;
+//		RNotifier iNotifier;
+		TPckgBuf<TInt> iResBuf;
 	
 		CNSmlThreadParams& iThreadParams;
 		CNSmlNotifierTimeOut iNotifierTimeOut;
 		TBool iTimeOut;
+
+		CHbDeviceDialogSymbian* iDevDialog;
+            RProperty iProperty;
+            TBool iHbSyncmlNotifierEnabled;
+           RDmDevDialog iDmDevdialog;
+
 	};