diff -r a15c582fbf97 -r ff9df6630274 usbclasses/usbobexclasscontroller/src/obexsmwatcher.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usbclasses/usbobexclasscontroller/src/obexsmwatcher.cpp	Mon Mar 15 12:44:42 2010 +0200
@@ -0,0 +1,104 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Monitors Obex ServiceMan errors.
+*
+*/
+
+#include "obexsmwatcher.h"
+#include <e32base.h>
+#include <obexservicemanprop.h>
+#include <usb/usblogger.h>
+
+#ifdef __FLOG_ACTIVE
+_LIT8(KLogComponent, "UsbObexCcSMW");
+#endif
+
+/**
+ * @since S60 V5.2
+ */
+CObexSMWatcher* CObexSMWatcher::NewL(MObexSMObserver& aObserver)
+    {
+    LOG_STATIC_FUNC_ENTRY
+
+    CObexSMWatcher* self = new (ELeave) CObexSMWatcher(aObserver);
+    CleanupStack::PushL( self);
+    self->ConstructL();
+    CleanupStack::Pop(self);
+    return self;
+    }
+
+/**
+ *
+ */
+CObexSMWatcher::~CObexSMWatcher()
+    {
+    LOG_FUNC
+    Cancel();
+    iObexSMPostInit.Close();
+    }
+
+/**
+ * Performs 2nd phase construction.
+ */
+void CObexSMWatcher::ConstructL()
+    {
+    LOG_FUNC
+
+    TInt err = iObexSMPostInit.Attach(KUidObexSMCategory, KObexSMPostInitErrorProperty);
+    User::LeaveIfError( err);
+    
+    RunL();
+    }
+
+/**
+ * 
+ */
+
+CObexSMWatcher::CObexSMWatcher(MObexSMObserver& aObserver) :
+    CActive(CActive::EPriorityStandard), iObserver(aObserver)
+    {
+    LOG_FUNC    
+    CActiveScheduler::Add(this);
+    }
+
+/**
+ * 
+ */
+void CObexSMWatcher::RunL()
+    {
+    LOG_FUNC 
+    
+    LOGTEXT2(_L8(">>CObexSMWatcher::RunL [iStatus=%d]"), iStatus.Int());
+    
+    iObexSMPostInit.Subscribe( iStatus );
+    SetActive();
+    
+    TInt value = KErrNone;
+    TInt err = iObexSMPostInit.Get(value);
+    if (err == KErrNone && value != KErrNone)
+        {
+        iObserver.MosmError(value);
+        }
+    
+    LOGTEXT(_L8("<<CObexSMWatcher::RunL"));
+    }
+
+/**
+ *
+ */
+void CObexSMWatcher::DoCancel()
+    {
+    LOG_FUNC
+    iObexSMPostInit.Cancel();
+    }