--- a/usbengines/usbotgwatcher/src/cusbindicatornotifier.cpp Tue Feb 02 00:52:37 2010 +0200
+++ b/usbengines/usbotgwatcher/src/cusbindicatornotifier.cpp Fri Feb 19 23:50:33 2010 +0200
@@ -60,13 +60,11 @@
{
if(iOtgWatcher->VBusObserver())
{
- TRAPD(err, iOtgWatcher->VBusObserver()->UnsubscribeL(this));
- err=err; // to avoid warning;
+ TRAP_IGNORE(iOtgWatcher->VBusObserver()->UnsubscribeL(*this));
}
// Unsubscribe from otg watcher states change notifications
- TRAPD(err, iOtgWatcher->UnsubscribeL(this));
- err=err; // to avoid warning;
+ TRAP_IGNORE(iOtgWatcher->UnsubscribeL(*this));
}
}
@@ -93,10 +91,10 @@
FLOG( _L( "[USBOTGWATCHER]\tCUsbIndicatorNotifier::ConstructL" ) );
// Subscribe for VBus change notifications
- iOtgWatcher->VBusObserver()->SubscribeL(this);
+ iOtgWatcher->VBusObserver()->SubscribeL(*this);
// Subscribe for otg watcher states change notifications
- iOtgWatcher->SubscribeL(this);
+ iOtgWatcher->SubscribeL(*this);
iIconBlinkingTimer = CUsbTimer::NewL(this, EIconBlinkingTimer);