--- a/photosgallery/slideshow/settingsdialog/src/shwslideshowsettingsdialog.cpp	Thu Jan 07 12:46:23 2010 +0200
+++ b/photosgallery/slideshow/settingsdialog/src/shwslideshowsettingsdialog.cpp	Mon Jan 18 20:19:20 2010 +0200
@@ -45,7 +45,6 @@
 #include "shwsettingsmodel.h"			 // for CShwSettingsModel
 #include "shwslideshowsettingslist.h"	 // for CShwSlideshowSettingsList
 
-#define GetAppUi() (dynamic_cast<CAknAppUi*>(iEikonEnv->EikAppUi()))
 //CONSTANTS
 namespace
 	{
@@ -119,7 +118,7 @@
 	// hide toolbar.	
 	SetSlShwToolbarVisibility(EFalse);
 	iStatusPaneChanged = EFalse;
-	iStatusPane = GetAppUi()->StatusPane();
+	iStatusPane = iAvkonAppUi->StatusPane();
     iTitlePane = ( CAknTitlePane* )iStatusPane->ControlL(
             TUid::Uid( EEikStatusPaneUidTitle ));
 	// If Status pane not visible, then make it visible.
@@ -155,8 +154,9 @@
 void CShwSlideshowSettingsDialog::SetSlShwToolbarVisibility(TBool aVisible)
     {
     TRACER("CShwSlideshowSettingsDialog::SetSlShwToolbarVisibility");
-    CAknAppUi* appUi = GetAppUi();
+    CAknAppUi* appUi = iAvkonAppUi;
     __ASSERT_DEBUG(appUi, Panic(EGlxPanicNullPointer));
+
     CAknToolbar* popupToolbar = appUi->PopupToolbar();
     if(popupToolbar)
         {
@@ -220,12 +220,6 @@
 	GLX_LOG_INFO("CShwSlideshowSettingsDialog::ProcessCommandL");			
 	switch (aCommandId)
 		{
-		case EShwCmdSettingsChange: 
-			{
-			CAknDialog::ProcessCommandL(aCommandId);
-		    iItemList->UpdateListBoxL(iItemList->ListBox()->CurrentItemIndex());
-			break;			
-			}
 		case EShwCmdHelp:
 			{
 			TCoeHelpContext helpContext;