diff -r 98b66e4fb0be -r 26b6f0522fd8 ncdengine/debuglogger/obex/src/btservicesearcher.cpp --- a/ncdengine/debuglogger/obex/src/btservicesearcher.cpp Fri Apr 16 15:05:20 2010 +0300 +++ b/ncdengine/debuglogger/obex/src/btservicesearcher.cpp Mon May 03 12:38:03 2010 +0300 @@ -27,11 +27,14 @@ CBTServiceSearcher::~CBTServiceSearcher() { +#ifdef _0 if (iIsDeviceSelectorConnected) { iDeviceSelector.CancelNotifier(KDeviceSelectionNotifierUid); iDeviceSelector.Close(); } +#endif + delete iSdpSearchPattern; iSdpSearchPattern = NULL; @@ -46,11 +49,14 @@ void CBTServiceSearcher::Cancel() { +#ifdef _0 if (iIsDeviceSelectorConnected) { iDeviceSelector.CancelNotifier(KDeviceSelectionNotifierUid); } +#endif + delete iSdpSearchPattern; iSdpSearchPattern = NULL; @@ -66,23 +72,28 @@ } -void CBTServiceSearcher::SelectDeviceByDiscoveryL(TRequestStatus& aObserverRequestStatus) +void CBTServiceSearcher::SelectDeviceByDiscoveryL(TRequestStatus& /* aObserverRequestStatus */) { + +#ifdef _0 if (!iIsDeviceSelectorConnected) { User::LeaveIfError(iDeviceSelector.Connect()); iIsDeviceSelectorConnected = ETrue; } +#endif // Request a device selection TBTDeviceSelectionParamsPckg selectionFilter; selectionFilter().SetUUID(ServiceClass()); - + +#ifdef _0 iDeviceSelector.StartNotifierAndGetResponse( aObserverRequestStatus, KDeviceSelectionNotifierUid, selectionFilter, iResponse); +#endif }