diff -r 085438c28042 -r 1c556dee8eb1 syncmlfw/dm/syncagent/src/nsmldmagent.cpp --- a/syncmlfw/dm/syncagent/src/nsmldmagent.cpp Fri Jul 23 13:39:21 2010 +0530 +++ b/syncmlfw/dm/syncagent/src/nsmldmagent.cpp Fri Aug 06 18:29:23 2010 +0530 @@ -50,7 +50,6 @@ #include "NSmlPrivateAPI.h" // FOTA end #include -const TUid KUidNotifier = { 0x101F8769 }; const TInt KNotifierTimeout = 300000000; // 5 min timeout _LIT8 ( KNSmlDMFotaNode, "FUMO" ); @@ -208,10 +207,7 @@ aAlertCode == KNSmlDMAgentNextMessage || aAlertCode == KNSmlDMAgentSessionAbortAlert || aAlertCode == KNSmlDMAgentDisplayAlert || - aAlertCode == KNSmlDMAgentContinueOrAbortAlert - || aAlertCode == KNSmlDMAgentUserInputAlert - || aAlertCode == KNSmlDMAgentSingleChoiceAlert - || aAlertCode == KNSmlDMAgentMultipleChoiceAlert ) + aAlertCode == KNSmlDMAgentContinueOrAbortAlert ) { return ETrue; } @@ -1899,16 +1895,6 @@ SetActive(); } - //connect to repository - CRepository* rep = CRepository::NewLC( KCRUidPolicyManagementUtilInternalKeys ); - - //get parameters - TSyncMLAppLaunchNotifParams params; - TPckg data( params ); - User::LeaveIfError( rep->Get( KSyncMLSessionParamsKey, data)); - - CleanupStack::PopAndDestroy( rep); - iNotifierTimeOut.LaunchNotifierTimer( this ); // User::LeaveIfError( iNotifier.Connect() ); // iNotifier.StartNotifierAndGetResponse( iStatus, KUidNotifier, data, iResBuf ); @@ -1957,7 +1943,6 @@ if ( ret == KErrNone ) { - TInt sid = iResBuf().iSecureId.iUid; // read secure id from notifier. // Check the response and error code. If there is a fail, dump the job. // Also compare sid to creator id saved for current job to secure that listener owns the job.