diff -r 6b5524b4f673 -r 38bb213f60ba phonebookui/Phonebook2/xSPExtensionManager/src/CxSPViewActivator.cpp --- a/phonebookui/Phonebook2/xSPExtensionManager/src/CxSPViewActivator.cpp Wed Sep 15 11:56:55 2010 +0300 +++ b/phonebookui/Phonebook2/xSPExtensionManager/src/CxSPViewActivator.cpp Wed Oct 13 14:15:33 2010 +0300 @@ -21,7 +21,6 @@ #include "CxSPViewActivator.h" #include #include "CxSPViewInfo.h" -#include // System includes @@ -138,34 +137,17 @@ newViewId = viewID; } - // If err is KErrNone or KErrNotFound, complete client's request with KErrNone. - // The reason is even if client passed an invalid view id to xsp server, - // the server will launch phonebook namelist view instead. - if ( KErrNone == err || KErrNotFound == err ) - { - aMessage.Complete( KErrNone ); - } - else - { - aMessage.Complete( err ); - } + aMessage.Complete(err); - if( err == KErrNone ) + if(err == KErrNone) { // Make view id - const TVwsViewId viewId( TUid::Uid( KUid ), TUid::Uid( newViewId ) ); + const TVwsViewId viewId(TUid::Uid(KUid), TUid::Uid(newViewId)); // Activate the view static_cast(CCoeEnv::Static()->AppUi())->ActivateViewL( viewId, CPbk2ViewState::Uid(), *paramBuf); } - else if ( err == KErrNotFound ) - { - // Activate phonebook namelist view if valid view id can't be found - const TVwsViewId viewId( TUid::Uid( KUid ), TUid::Uid( EPbk2NamesListViewId ) ); - static_cast( CCoeEnv::Static()->AppUi() )->ActivateViewL( - viewId, CPbk2ViewState::Uid(), *paramBuf ); - } - + CleanupStack::PopAndDestroy(); // paramBuf; } }