equal
deleted
inserted
replaced
809 // notifier does not exist anymore. |
809 // notifier does not exist anymore. |
810 TBuf8<1> dummy; |
810 TBuf8<1> dummy; |
811 |
811 |
812 if (!iHbSyncmlNotifierEnabled) |
812 if (!iHbSyncmlNotifierEnabled) |
813 { |
813 { |
814 iNotifier.StartNotifier(KNullUid, dummy, dummy); // KNullUid should do also.. |
814 // iNotifier.StartNotifier(KNullUid, dummy, dummy); // KNullUid should do also.. |
815 |
815 |
816 iNotifier.CancelNotifier(KUidNotifier); |
816 // iNotifier.CancelNotifier(KUidNotifier); |
817 iNotifier.Close(); |
817 // iNotifier.Close(); |
818 } |
818 } |
819 else |
819 else |
820 { |
820 { |
821 iProperty.Close(); |
821 iProperty.Close(); |
822 } |
822 } |
847 iNotifierTimeOut.LaunchNotifierTimer( this ); |
847 iNotifierTimeOut.LaunchNotifierTimer( this ); |
848 } |
848 } |
849 |
849 |
850 TInt err = KErrNone; |
850 TInt err = KErrNone; |
851 |
851 |
852 if (!iHbSyncmlNotifierEnabled) //Syncml notifier |
852 /* if (!iHbSyncmlNotifierEnabled) //Syncml notifier |
853 err = iNotifier.Connect(); |
853 err = iNotifier.Connect(); |
854 |
854 */ |
855 if (err == KErrNone) |
855 if (err == KErrNone) |
856 { |
856 { |
857 if (!iHbSyncmlNotifierEnabled) |
857 if (!iHbSyncmlNotifierEnabled) |
858 { |
858 { |
859 iNotifier.StartNotifierAndGetResponse(iStatus, KUidNotifier, |
859 // iNotifier.StartNotifierAndGetResponse(iStatus, KUidNotifier, |
860 data, iResBuf); |
860 // data, iResBuf); |
861 LOGSTRING2( "CNSmlNotifierObserver::ConnectToNotifierL %d after connect, StartNotifierAndGetResponse and after setactive" , iStatus.Int()); |
861 LOGSTRING2( "CNSmlNotifierObserver::ConnectToNotifierL %d after connect, StartNotifierAndGetResponse and after setactive" , iStatus.Int()); |
862 } |
862 } |
863 else |
863 else |
864 { |
864 { |
865 HbNotifierObserverL(aParam); |
865 HbNotifierObserverL(aParam); |
1013 // StartNotifier called to avoid Notifier server panic, if |
1013 // StartNotifier called to avoid Notifier server panic, if |
1014 // notifier does not exist anymore. |
1014 // notifier does not exist anymore. |
1015 if(!iHbSyncmlNotifierEnabled) |
1015 if(!iHbSyncmlNotifierEnabled) |
1016 { |
1016 { |
1017 TBuf8<1> dummy; |
1017 TBuf8<1> dummy; |
1018 iNotifier.StartNotifier(KNullUid, dummy, dummy); // KNullUid should do also.. |
1018 // iNotifier.StartNotifier(KNullUid, dummy, dummy); // KNullUid should do also.. |
1019 iNotifier.CancelNotifier( KUidNotifier ); |
1019 // iNotifier.CancelNotifier( KUidNotifier ); |
1020 } |
1020 } |
1021 else |
1021 else |
1022 { |
1022 { |
1023 iProperty.Close(); |
1023 iProperty.Close(); |
1024 } |
1024 } |