--- a/syncmlfw/common/sosserver/src/nsmlsosthread.cpp Wed Aug 18 10:39:36 2010 +0300
+++ b/syncmlfw/common/sosserver/src/nsmlsosthread.cpp Thu Sep 02 21:22:11 2010 +0300
@@ -834,52 +834,27 @@
//
void CNSmlNotifierObserver::ConnectToNotifierL( const TSyncMLAppLaunchNotifParams& aParam )
{
- _DBG_FILE( "CNSmlNotifierObserver::ConnectToNotifierL:Begin" );
- iTimeOut = EFalse;
-
- /*if ( !IsActive() )
- {
- SetActive();
- }*/
-
-
-
+ _DBG_FILE( "CNSmlNotifierObserver::ConnectToNotifierL:Begin" );
+ iTimeOut = EFalse;
if ( !KNSmlWaitNotifierForEver )
{
iNotifierTimeOut.LaunchNotifierTimer( this );
}
- TInt err = KErrNone;
-
- /* if (!iHbSyncmlNotifierEnabled) //Syncml notifier
- err = iNotifier.Connect();
-*/
- if (err == KErrNone)
- {
- if (!iHbSyncmlNotifierEnabled)
- {
-// iNotifier.StartNotifierAndGetResponse(iStatus, KUidNotifier,
-// data, iResBuf);
- LOGSTRING2( "CNSmlNotifierObserver::ConnectToNotifierL %d after connect, StartNotifierAndGetResponse and after setactive" , iStatus.Int());
- }
- else
- {
+ if (!iHbSyncmlNotifierEnabled)
+ {
+ LOGSTRING2( "CNSmlNotifierObserver::ConnectToNotifierL %d after connect, StartNotifierAndGetResponse and after setactive" , iStatus.Int());
+ }
+ else
+ {
iStatus = KRequestPending;
- HbNotifierObserverL(aParam);
- }
- if ( !IsActive() )
- {
- SetActive();
- }
- }
- else
- {
- LOGSTRING("Stop job error connecting to notifier");
- // Stop job. Error connecting to notifier.
- TRequestStatus* sStatus = &iStatus;
- User::RequestComplete( sStatus, err );
- }
+ HbNotifierObserverL(aParam);
+ }
+ if ( !IsActive() )
+ {
+ SetActive();
+ }
_DBG_FILE("CNSmlNotifierObserver::ConnectToNotifierL:End");
}