diff -r 3f7d9dbe57c8 -r 19fb38abab1d syncmlfw/common/sosserver/inc/nsmlsosthread.h
--- a/syncmlfw/common/sosserver/inc/nsmlsosthread.h	Tue Feb 02 00:44:00 2010 +0200
+++ b/syncmlfw/common/sosserver/inc/nsmlsosthread.h	Fri Apr 16 15:52:47 2010 +0300
@@ -21,8 +21,11 @@
 
 #include <SyncMLNotifierParams.h>
 #include <SyncMLNotifier.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() 
 			{
@@ -182,6 +185,8 @@
 		~CNSmlNotifierObserver();
 		void ConnectToNotifierL( const TSyncMLAppLaunchNotifParams& aParam );
 		void NotifierTimeOut();
+		TBool IsHbSyncmlNotifierEnabledL();
+		void HbNotifierObserverL(const TSyncMLAppLaunchNotifParams& aParam);
 	protected:
 		void DoCancel();
 		void RunL();
@@ -194,6 +199,12 @@
 		CNSmlThreadParams& iThreadParams;
 		CNSmlNotifierTimeOut iNotifierTimeOut;
 		TBool iTimeOut;
+
+		CHbDeviceDialogSymbian* iDevDialog;
+            RProperty iProperty;
+            TBool iHbSyncmlNotifierEnabled;
+		
+
 	};