--- a/omads/omadsappui/AspSyncUtil/src/AspProfileWizardDialog.cpp	Wed Apr 14 15:45:46 2010 +0300
+++ b/omads/omadsappui/AspSyncUtil/src/AspProfileWizardDialog.cpp	Tue Apr 27 16:23:46 2010 +0300
@@ -60,7 +60,7 @@
 //
 CAspTextSettingPage::~CAspTextSettingPage()
 	{
-	delete iIndicatorHandler;
+	delete iNaviPaneHandler;
 	}
 
 
@@ -133,14 +133,14 @@
 //
 void CAspTextSettingPage::UpdateNaviPaneL()
     {
-    if (!iIndicatorHandler)
-    	{
-    	iIndicatorHandler = new (ELeave) CAspIndicatorHandler(
-    	                                 iAvkonEnv->EditingStateIndicator());
-    	}
-    	
-    iIndicatorHandler->SetIndicatorStateL(
-              EAknNaviPaneEditorIndicatorMessageLength, iParam.iPageText);
+    
+    if (!iNaviPaneHandler)
+           {
+           iNaviPaneHandler = new (ELeave) CAspNaviPaneHandler(
+                                  iEikonEnv->AppUiFactory()->StatusPane());
+           }
+           
+       iNaviPaneHandler->SetNaviPaneTitleL(iParam.iPageText);
     }
     
 
@@ -256,18 +256,17 @@
 
 void CAspRadioButtonSettingPage::HandleListBoxEventL(CEikListBox* aListBox, TListBoxEvent aEventType)
 {
-	if( AknLayoutUtils::PenEnabled() )
-	{
-	  	switch(aEventType)
-		{  
-		   case EEventItemSingleClicked:
-       			 this->ProcessCommandL(EAknSoftkeySelect);	
-        		 break;
-		  	default:
-				break;
-    		
-		}	
-	}
+
+    TInt oldSelect = ListBoxControl()->CurrentItemIndex();
+    CAknRadioButtonSettingPage::HandleListBoxEventL( aListBox, aEventType );
+    if ( oldSelect != ListBoxControl()->CurrentItemIndex() )
+
+    {
+
+       TBuf<KBufSize> buf;
+       buf.Num(oldSelect);
+       TBool ret = iParam.iObserver->CheckValidity(buf, iParam.iSettingType);
+    }
 }
 
 // ----------------------------------------------------------------------------
@@ -321,7 +320,7 @@
 //
 CAspAlphaPasswordSettingPage::~CAspAlphaPasswordSettingPage()
 	{
-	delete iIndicatorHandler;
+	delete iNaviPaneHandler;
 	}
 
 
@@ -357,14 +356,14 @@
 //
 void CAspAlphaPasswordSettingPage::UpdateNaviPaneL()
     {
-    if (!iIndicatorHandler)
-    	{
-    	iIndicatorHandler = new (ELeave) CAspIndicatorHandler(
-    	                                 iAvkonEnv->EditingStateIndicator());
-    	}
-    	
-    iIndicatorHandler->SetIndicatorStateL(
-              EAknNaviPaneEditorIndicatorMessageLength, iParam.iPageText);
+    
+    if (!iNaviPaneHandler)
+               {
+               iNaviPaneHandler = new (ELeave) CAspNaviPaneHandler(
+                                      iEikonEnv->AppUiFactory()->StatusPane());
+               }
+               
+           iNaviPaneHandler->SetNaviPaneTitleL(iParam.iPageText);
     }