--- a/syncmlfw/dm/syncagent/inc/NSmlDMCmds.h	Tue Aug 31 16:04:06 2010 +0300
+++ b/syncmlfw/dm/syncagent/inc/NSmlDMCmds.h	Wed Sep 01 12:27:42 2010 +0100
@@ -70,12 +70,21 @@
 	void FreeDMDevinfo();
 	TInt AlertParameter ( const SmlPcdata_t* aData, const TDesC8& aParamID ) const;
 //#ifdef RD_DM_TEXT_INPUT_ALERT //For User Input Server alert
+	TInt AlertInputTypeParameter ( const SmlPcdata_t* aData, const TDesC8& aParamID ) const;
+	TInt AlertEchoTypeParameter ( const SmlPcdata_t* aData, const TDesC8& aParamID ) const;
+	TBool CheckDRPresence( const SmlPcdata_t* aData, const TDesC8& aParamID ) const;
+	TPtrC8 AlertDefaultResponseParam ( const SmlPcdata_t* aData, const TDesC8& aParamID ) const;
 //#endif
 	//singlechoice
+	HBufC8* AlertChoiceItemsLC( SmlItemList_t* aItemList, HBufC8*& aLengthBuf,TInt& aNumItems  ) const;
 	void HandleAlertsL( SmlAlert_t* aAlert, TInt& aStatusId);
 	void HandleAlertErrorL();
+	void HandleChoiceAlertsL( SmlAlert_t* aAlert, TInt& aStatusId);
+	void SendMultiChoiceDataToServerL(TDes8& aData,TInt& aStatusId);
 	void HandleConfirmationAlertL( SmlAlert_t* aAlert, TInt& aStatusId);
 	void HandleDisplayAlertL( SmlAlert_t* aAlert, TInt& aStatusId);
+	void HandleUserInputalertL( SmlAlert_t* aAlert, TInt& aStatusId);
+	TInt FindMaxLength(TInt aSourceLength, TInt aDestLength);
 	//singlechoice
 	HBufC8* AlertDataLC( const SmlItemList_t* aItemList ) const;
 	TInt InitStatusToAtomicOrSequenceL( const TDesC8& aCmd, const SmlAtomic_t* aAtomic ) const;
@@ -162,10 +171,6 @@
 	*/
 	void UpdateErrorStatusCode(SmlItem_t* aItem,TNSmlError::TNSmlSyncMLStatusCode& aStatusCode);
 	
-	
-	TBool IsHbSyncmlNotifierEnabledL();
-	void ServerHbNotifierL(TSyncMLDlgNoteTypes& aNotetype, TDesC& aServerMsg);
-	
 	//
 	private:     // Data
 	struct TDMDevInfo