# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1272374626 -10800
# Node ID 2bbcc0756c6dcb7b62174f76eedf70638f6b2f84
# Parent  a564f66a2339e04a8ba91ee0d0020891d9ae8518
Revision: 201015
Kit: 201017

diff -r a564f66a2339 -r 2bbcc0756c6d omads/omadsappui/AspSyncUtil/inc/AspProfileWizardDialog.h
--- a/omads/omadsappui/AspSyncUtil/inc/AspProfileWizardDialog.h	Wed Apr 14 15:45:46 2010 +0300
+++ b/omads/omadsappui/AspSyncUtil/inc/AspProfileWizardDialog.h	Tue Apr 27 16:23:46 2010 +0300
@@ -117,7 +117,7 @@
 	    
 	private:
 	    TAspSettingPageParam& iParam;
-	    CAspIndicatorHandler* iIndicatorHandler;
+	    CAspNaviPaneHandler* iNaviPaneHandler;
 	};
 
 
@@ -202,8 +202,8 @@
 
 	private:
 	    TAspSettingPageParam& iParam;
-	    //CAspNaviPaneHandler* iNaviPaneHandler;
-	    CAspIndicatorHandler* iIndicatorHandler;
+	    CAspNaviPaneHandler* iNaviPaneHandler;
+	   
 	};
 
 
diff -r a564f66a2339 -r 2bbcc0756c6d omads/omadsappui/AspSyncUtil/src/AspAdvanceSettingsDialog.cpp
--- a/omads/omadsappui/AspSyncUtil/src/AspAdvanceSettingsDialog.cpp	Wed Apr 14 15:45:46 2010 +0300
+++ b/omads/omadsappui/AspSyncUtil/src/AspAdvanceSettingsDialog.cpp	Tue Apr 27 16:23:46 2010 +0300
@@ -332,6 +332,7 @@
 	switch (aCommandId)
 		{
 		case EAspMenuCmdHelp:
+		case EAknCmdHelp:
 			{
 			TUtil::LaunchHelpAppL(iEikonEnv);
             break;
diff -r a564f66a2339 -r 2bbcc0756c6d omads/omadsappui/AspSyncUtil/src/AspProfile.cpp
--- a/omads/omadsappui/AspSyncUtil/src/AspProfile.cpp	Wed Apr 14 15:45:46 2010 +0300
+++ b/omads/omadsappui/AspSyncUtil/src/AspProfile.cpp	Tue Apr 27 16:23:46 2010 +0300
@@ -449,21 +449,39 @@
 
 		    if ( iApplicationId == 0 )
 		        {
-		        if ( operatorProfile )
-		            {
-		            if ( id != KUidNSmlAdapterContact.iUid )
-		                {
-		                User::LeaveIfError(iProviderList.Append(item)); 
-		                }
-		            }
-		        else
-		            {
-		            if ( id != operatorUid && id != profileUid )
-		                {
-		                User::LeaveIfError(iProviderList.Append(item));
-		                }
-		            }
-		        }
+                if( operatorUid != KUidNSmlAdapterContact.iUid &&
+                    operatorUid != 0 )
+                    {
+                    // Dedicated operator specific adapter in use
+                    if ( operatorProfile )
+                        {
+                        // Operator profile: show other adapters than platform's 
+                        //  contacts adapter
+                        if ( id != KUidNSmlAdapterContact.iUid )
+                            {
+                            User::LeaveIfError(iProviderList.Append(item)); 
+                            }
+                        }
+                    else
+                        {
+                        // Non-operator profile: show other adapters than
+                        //  operator specific contacts adapter & profile adapter
+                        if ( id != operatorUid && id != profileUid )
+                            {
+                            User::LeaveIfError(iProviderList.Append(item));
+                            }
+                        }
+                    }
+                else
+                    {
+                    // Platform's contacts adapter used as operator adapter
+                    if( operatorProfile || 
+                        ( !operatorProfile && id != profileUid ) )
+                        {
+                        User::LeaveIfError(iProviderList.Append(item));
+                        }
+                    }
+                }
 		    else
 		        {
                 User::LeaveIfError(iProviderList.Append(item));
diff -r a564f66a2339 -r 2bbcc0756c6d omads/omadsappui/AspSyncUtil/src/AspProfileDialog.cpp
--- a/omads/omadsappui/AspSyncUtil/src/AspProfileDialog.cpp	Wed Apr 14 15:45:46 2010 +0300
+++ b/omads/omadsappui/AspSyncUtil/src/AspProfileDialog.cpp	Tue Apr 27 16:23:46 2010 +0300
@@ -964,25 +964,31 @@
 			continue;
 			}
 		
-		// In Phonebooks syncronization settings, remove another provider from
-		// end of settings item list
-		if (appId == EApplicationIdContact)
-			{
-			TInt operatorUid = CAspProfile::OperatorAdapterUidL();
-			//if current profile is operator profile, don't display s60 contacts adapter
-			if (CAspProfile::IsOperatorProfileL(iProfile))
-				{
-				if (operatorUid != providerItem.iDataProviderId)
-					{
-					continue;
-					}
-				}
-            //if current profile is not operator profile, don't display operator adapter
-            else if (operatorUid == providerItem.iDataProviderId)
+        // In Phonebooks synchronization settings, remove another provider from
+        //  end of settings item list (unless platform's contacts adapter is
+        //  is defined as operator specific adapter and thus there is no dedicated
+        //  operator specific adapter)
+        if (appId == EApplicationIdContact)
+            {
+            TInt operatorUid = CAspProfile::OperatorAdapterUidL();
+            if ( operatorUid != KUidNSmlAdapterContact.iUid &&
+                operatorUid != 0 )
                 {
-                continue;
+                // Operator profile: do not display s60 contacts adapter
+                if (CAspProfile::IsOperatorProfileL(iProfile))
+                    {
+                    if (operatorUid != providerItem.iDataProviderId)
+                        {
+                        continue;   
+                        }
+                    }
+                // Non-operator profile: Do not display operator adapter
+                else if (operatorUid == providerItem.iDataProviderId)
+                    {
+                    continue;                    
+                    }                    
                 }
-			}
+            }
 
 		HBufC* firstLine = CAspResHandler::GetContentSettingLC(
 		                                   providerItem.iDataProviderId,
diff -r a564f66a2339 -r 2bbcc0756c6d omads/omadsappui/AspSyncUtil/src/AspProfileWizardDialog.cpp
--- 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);
     }
 
 
diff -r a564f66a2339 -r 2bbcc0756c6d omads/omadsappui/AspSyncUtil/src/AspUtil.cpp
--- a/omads/omadsappui/AspSyncUtil/src/AspUtil.cpp	Wed Apr 14 15:45:46 2010 +0300
+++ b/omads/omadsappui/AspSyncUtil/src/AspUtil.cpp	Tue Apr 27 16:23:46 2010 +0300
@@ -397,7 +397,7 @@
          delete repository;
         }
 
-    if ( (id == KErrNotFound) || (err != KErrNone) )
+    if ( (id == KErrNotFound) || (err != KErrNone) || (id == 0) )
         {
         // Use default adapter
         id = ProviderIdFromAppId(aApplicationId);