diff -r b4758b4b2d20 -r de84881f4ac3 simpledatamodeladapter/src/presencepluginwatcher.cpp --- a/simpledatamodeladapter/src/presencepluginwatcher.cpp Wed Apr 14 16:22:17 2010 +0300 +++ b/simpledatamodeladapter/src/presencepluginwatcher.cpp Tue Apr 27 17:03:39 2010 +0300 @@ -29,6 +29,7 @@ #include #include #include +#include #include "presencepluginvirtualgroup.h" #include "mpresencepluginconnectionobs.h" @@ -139,11 +140,16 @@ pres8 = CnvUtfConverter::ConvertFromUnicodeToUtf8L( iPresIdentity->Des() ); CleanupStack::PushL( pres8 ); // << pres8 - + + // remove escapes + HBufC8* encodedUsername = EscapeUtils::EscapeEncodeL( *pres8, EscapeUtils::EEscapeNormal ); + CleanupStack::PopAndDestroy( pres8 ); + CleanupStack::PushL( encodedUsername ); + CPresencePluginEntityWatcher* watcher = - MatchWatcherL( pres8->Des(), ETrue ); - watcher->StartSubscribeL( pres8->Des(), aStatus ); - CleanupStack::PopAndDestroy( pres8 ); // >> pres8 + MatchWatcherL( encodedUsername->Des(), ETrue ); + watcher->StartSubscribeL( encodedUsername->Des(), aStatus ); + CleanupStack::PopAndDestroy( encodedUsername ); } // ---------------------------------------------------------------------------