# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572433 0
# Node ID 8bdeb2d50f7b62d6130b8c3224ab7da67a68da4d
# Parent  28640b20cc44d4b8c3e27327f3267dd04a95bd56# Parent  7bc6ab9b5bcda7f17ae73b51e9820834f81b0a3e
Automatic merge from PDK_3.0.h

diff -r 28640b20cc44 -r 8bdeb2d50f7b webservices/wsidentitymanager/inc/senbaseidentitymanager.h
--- a/webservices/wsidentitymanager/inc/senbaseidentitymanager.h	Mon Mar 08 21:44:27 2010 +0000
+++ b/webservices/wsidentitymanager/inc/senbaseidentitymanager.h	Sun Mar 14 13:13:53 2010 +0000
@@ -306,7 +306,7 @@
         */
         virtual TInt WriteConfigurationToL( const TDesC& aFile );
         TBool AllowSavePasswordL();
-        /** Improved heuristics from Identity DB removal / cleanups : Naga
+        /** Improved heuristics from Identity DB removal / cleanups
 	    *
 	    * Checks touch attribute value for all IdentityProvider child elements of 
 	    * current Identity element if that exceeds the the tick counts for two weeks 
diff -r 28640b20cc44 -r 8bdeb2d50f7b webservices/wsoviplugin/inc/wsovicons.h
--- a/webservices/wsoviplugin/inc/wsovicons.h	Mon Mar 08 21:44:27 2010 +0000
+++ b/webservices/wsoviplugin/inc/wsovicons.h	Sun Mar 14 13:13:53 2010 +0000
@@ -200,7 +200,9 @@
 
     _LIT8(KUserInfoLocalName,"userInfo");
     _LIT8(KUserNameLocalName,"username");
-	
+	_LIT8( KMobileUsed1,             "Mobile number" );
+    _LIT8( KMobileUsed2,             "already used today" );
+	_LIT8(KEmailUsed, "You have already a Nokia account associated with this mobile number or email address.");
 	}
 
 #endif // CONSPLUGIN_H
diff -r 28640b20cc44 -r 8bdeb2d50f7b webservices/wsoviplugin/src/wsoviserviceupdatehandler.cpp
--- a/webservices/wsoviplugin/src/wsoviserviceupdatehandler.cpp	Mon Mar 08 21:44:27 2010 +0000
+++ b/webservices/wsoviplugin/src/wsoviserviceupdatehandler.cpp	Sun Mar 14 13:13:53 2010 +0000
@@ -139,7 +139,18 @@
 						{
 						pCtx.Add(WSOviContextKeys::KServiceSession, *(MSenRemoteServiceSession*)remoteServiceSession);
 						}
-					pCtx.Update(WSOviContextKeys::KReAuthNeeded, ETrue);
+					if( ! errFragment->Text().Compare(WSOviResponse::KEmailUsed()) ||
+					       (errFragment->Text().Compare(WSOviResponse::KMobileUsed1)!= KErrNotFound &&
+					        errFragment->Text().Compare(WSOviResponse::KMobileUsed2) != KErrNotFound )
+					    )
+					    {
+					    pCtx.Update(WSOviContextKeys::KRetryNeeded, EFalse);
+					    }
+					else
+					    {
+					    pCtx.Update(WSOviContextKeys::KReAuthNeeded, ETrue);
+					    }
+					
 					oviServiceSession->ClearCredentialL();
 					oviServiceSession->SetStatusL();//in order to compute state
 				}
diff -r 28640b20cc44 -r 8bdeb2d50f7b webservices/wsstar/wsstarmessagehandlers/src/wsstaraddressinghandler.cpp
--- a/webservices/wsstar/wsstarmessagehandlers/src/wsstaraddressinghandler.cpp	Mon Mar 08 21:44:27 2010 +0000
+++ b/webservices/wsstar/wsstarmessagehandlers/src/wsstaraddressinghandler.cpp	Sun Mar 14 13:13:53 2010 +0000
@@ -225,7 +225,7 @@
     CSenElement* ppElem = CWSStarMessageUtils::FindElementL(Kpp, header);
     if(ppElem)
         {
-        CSenElement* credPropertiesElem = CWSStarMessageUtils::FindElementL(KCredProperties, *ppElem);//Naga
+        CSenElement* credPropertiesElem = CWSStarMessageUtils::FindElementL(KCredProperties, *ppElem);
         if(credPropertiesElem)
             {
             CWSStarMessageUtils::FindElementL(KCredProperty, *credPropertiesElem, credPropertiesElements);