diff -r 87476091b3f5 -r 1db7cc813a4e homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallcollectionsstate.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallcollectionsstate.cpp Fri Jul 23 13:47:57 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallcollectionsstate.cpp Fri Aug 06 13:36:36 2010 +0300 @@ -85,17 +85,15 @@ { HSMENUTEST_FUNC_ENTRY("HsAllCollectionsState::setMenuOptions"); - QScopedPointer viewOptions(new HbMenu); - - viewOptions->addAction(hbTrId("txt_applib_opt_task_switcher"), + mViewOptions->clearActions(); + mViewOptions->addAction(hbTrId("txt_applib_opt_task_switcher"), static_cast(this), SLOT(openTaskSwitcher())); - viewOptions->addAction(hbTrId("txt_applib_opt_new_collection"), + mViewOptions->addAction(hbTrId("txt_applib_opt_new_collection"), this, SLOT(createNewCollection())); - viewOptions->addAction(hbTrId("txt_applib_opt_arrange"), + mViewOptions->addAction(hbTrId("txt_applib_opt_arrange"), this, SLOT(createArrangeCollection())); - mMenuView->view()->setMenu(viewOptions.take()); HSMENUTEST_FUNC_EXIT("HsAllCollectionsState::setMenuOptions"); } @@ -153,7 +151,7 @@ */ void HsAllCollectionsState::normalModeExited() { - mMenuView->view()->setMenu(NULL); + }