diff -r 523e04129df6 -r 41d00e97e2f7 application/src/PodcastSearchView.cpp --- a/application/src/PodcastSearchView.cpp Thu Apr 01 11:39:23 2010 +0200 +++ b/application/src/PodcastSearchView.cpp Thu Apr 01 11:41:33 2010 +0200 @@ -37,7 +37,6 @@ #include #include #include -#include const TInt KMaxFeedNameLength = 100; const TInt KDefaultGran = 5; @@ -128,23 +127,18 @@ TUid aCustomMessageId, const TDesC8& aCustomMessage) { - UpdateToolbar(); - - CAknTitlePane* titlePane = static_cast - ( StatusPane()->ControlL( TUid::Uid( EEikStatusPaneUidTitle ) ) ); - - ((CPodcastAppUi*)AppUi())->NaviSetTextL(R_SEARCH_RESULTS); - CPodcastListView::DoActivateL(aPrevViewId, aCustomMessageId, aCustomMessage); iPreviousView = TVwsViewId(KUidPodcast, KUidPodcastFeedViewID); + + ((CPodcastAppUi*)AppUi())->NaviSetTextL(R_SEARCH_RESULTS); + + UpdateListboxItemsL(); + UpdateToolbar(); } void CPodcastSearchView::DoDeactivate() { CPodcastListView::DoDeactivate(); - CAknTitlePane* titlePane = static_cast - ( StatusPane()->ControlL( TUid::Uid( EEikStatusPaneUidTitle ) ) ); - titlePane->SetTextToDefaultL(); ((CPodcastAppUi*)AppUi())->NaviShowTabGroupL(); } @@ -239,7 +233,7 @@ iEikonEnv->ReadResourceL(templ, R_ADD_FEED_QUERY); message.Format(templ, &newInfo->Title()); - if(ShowQueryMessage(message)) { + if(ShowQueryMessageL(message)) { TBool added = iPodcastModel.FeedEngine().AddFeedL(*newInfo); if (added) @@ -247,7 +241,7 @@ // ask if user wants to update it now TBuf message; iEikonEnv->ReadResourceL(message, R_ADD_FEED_SUCCESS); - if(ShowQueryMessage(message)) + if(ShowQueryMessageL(message)) { CFeedInfo *info = iPodcastModel.FeedEngine().GetFeedInfoByUid(newInfo->Uid()); @@ -261,7 +255,7 @@ { TBuf message; iEikonEnv->ReadResourceL(message, R_ADD_FEED_EXISTS); - ShowErrorMessage(message); + ShowErrorMessageL(message); } } } @@ -277,8 +271,7 @@ void CPodcastSearchView::OpmlParsingComplete(TInt /*aError*/, TUint /*aNumFeedsImported*/) { DP("CPodcastSearchView::OpmlParsingComplete BEGIN"); - UpdateListboxItemsL(); - UpdateToolbar(); + DP("CPodcastSearchView::OpmlParsingComplete END"); }