diff -r 39ab869ed429 -r 753e33780645 htiui/HtiServicePlugins/HtiPIMServicePlugin/src/HtiPIMServicePlugin.cpp --- a/htiui/HtiServicePlugins/HtiPIMServicePlugin/src/HtiPIMServicePlugin.cpp Wed Aug 25 15:45:01 2010 +0300 +++ b/htiui/HtiServicePlugins/HtiPIMServicePlugin/src/HtiPIMServicePlugin.cpp Fri Sep 03 07:53:25 2010 +0300 @@ -19,14 +19,18 @@ // INCLUDE FILES #include "HtiPIMServicePlugin.h" #include "PIMHandler.h" + +#if ( SYMBIAN_VERSION_SUPPORT < SYMBIAN_4 ) #include "HtiBookmarkHandler.h" +#endif + #include "HtiSimDirHandler.h" #include #include // CONSTANTS _LIT8( KErrorMissingCommand, "Missing command" ); - +_LIT8( KErrorUnrecognizedCommand, "Unrecognized command" ); // ---------------------------------------------------------------------------- // Create instance of concrete ECOM interface implementation CHtiPIMServicePlugin* CHtiPIMServicePlugin::NewL() @@ -48,7 +52,9 @@ { HTI_LOG_TEXT("CHtiPIMServicePlugin destroy"); delete iPimHandler; +#if ( SYMBIAN_VERSION_SUPPORT < SYMBIAN_4 ) delete iBookmarkHandler; +#endif delete iSimDirHandler; } @@ -91,7 +97,8 @@ } iSimDirHandler->ProcessMessageL( aMessage, aPriority ); } - else +#if ( SYMBIAN_VERSION_SUPPORT < SYMBIAN_4 ) + else if ( aCommand <= EDeleteBookmark) { if ( iBookmarkHandler == NULL ) { @@ -100,6 +107,12 @@ } iBookmarkHandler->ProcessMessageL( aMessage, aPriority ); } +#endif + else + { + User::LeaveIfError( iDispatcher->DispatchOutgoingErrorMessage( + KErrArgument, KErrorUnrecognizedCommand, KPIMServiceUid ) ); + } HTI_LOG_FUNC_OUT( "CHtiPIMServicePlugin::ProcessMessageL" ); } @@ -112,11 +125,13 @@ { return iPimHandler->IsBusy(); } - + +#if ( SYMBIAN_VERSION_SUPPORT < SYMBIAN_4 ) if ( iBookmarkHandler ) { return iBookmarkHandler->IsBusy(); } +#endif if( iSimDirHandler) {