# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572286 0
# Node ID 724b5986c13204bfbe4c5b6eb3c42cb7cc1d3121
# Parent  98b9acb58e02675ade73cdac304f4d04de494bdd# Parent  ca392eff71523a3370ed5fc11be08c77fb6c15c1
Automatic merge from PDK_3.0.h

diff -r 98b9acb58e02 -r 724b5986c132 XDMSettingsUI/src/XDMPlugin.cpp
--- a/XDMSettingsUI/src/XDMPlugin.cpp	Mon Mar 08 21:43:56 2010 +0000
+++ b/XDMSettingsUI/src/XDMPlugin.cpp	Sun Mar 14 13:11:26 2010 +0000
@@ -412,9 +412,9 @@
 //
 void CXDMPlugin::HandleResourceChangeManual(TInt aType)
     {
-    if (iMainListContainer)
+    if ( iSettingListContainer )
         iSettingListContainer->HandleResourceChangeManual(aType);    
-    if (iSettingListContainer)
+    if ( iMainListContainer )
         iMainListContainer->HandleResourceChangeManual(aType);
     }
     
@@ -465,6 +465,10 @@
         {
         cba->SetCommandSetL(R_XDMUI_MAINVIEW_SOFTKEYS_SL);
         cba->MakeCommandVisible( EGSXDMPluginCmdChange, ETrue);
+        if ( iSettingListContainer->IsVisible() )
+            {
+            iCurrentContainer->DrawNow();
+            }
         }
     cba->DrawNow();
     }
diff -r 98b9acb58e02 -r 724b5986c132 xdmprotocols/XcapProtocol/XcapHttpTransport/src/XcapHttpAuthManager.cpp
--- a/xdmprotocols/XcapProtocol/XcapHttpTransport/src/XcapHttpAuthManager.cpp	Mon Mar 08 21:43:56 2010 +0000
+++ b/xdmprotocols/XcapProtocol/XcapHttpTransport/src/XcapHttpAuthManager.cpp	Sun Mar 14 13:11:26 2010 +0000
@@ -298,13 +298,12 @@
         iTransportMain.WriteToLog( _L8( "CXcapHttpAuthManager::RequestDigestLC()" ) );
     #endif
     HBufC8* ret = NULL;
-    TPtrC8 nonce( iServerNonce->Des() );
     if( iQop == EXcapAuth || iQop == EXcapAuthInt )
         {
         TBuf8<8> nonceCount;
         TBuf8<KXcapHashLength> hashBush;
         nonceCount.AppendFormat( _L8( "%08x" ), iNonceCount );
-        TPtrC8 nonce( iServerNonce->Des() );
+        TPtrC8 nonce( iServerNonce ? iServerNonce->Des() : TPtrC8() );
         TPtrC8 qop( iQop == EXcapAuth ? _L8( "auth" ) : _L8( "auth-int" ) );
         HBufC8* stringToHash = HBufC8::NewLC( nonce.Length() + qop.Length() +
                                               3 * KXcapHashLength + 8 + 5 );
@@ -321,7 +320,7 @@
         desc.Append(':');
         ConstructHA2L( hashBush, aHttpRequest );
         desc.Append( hashBush ); 
-        hashBush.Zero();		
+        hashBush.Zero();
         ret = HBufC8::NewL( KXcapHashLength );
         Hash( *stringToHash, hashBush );
         ret->Des().Copy( hashBush );
@@ -509,16 +508,19 @@
     #ifdef _DEBUG
         iTransportMain.WriteToLog( _L8( "CXcapHttpAuthManager::ConstructHA1L()" ) );
     #endif
+
+    TPtrC8 realm( iRealm ? iRealm->Des() : TPtrC8() );
+
     HBufC8* buffer = HBufC8::NewLC( iUserName.Length() +
-                     iPassword.Length() + iRealm->Des().Length() + 2 ); 
+                     iPassword.Length() + realm.Length() + 2 );
     TPtr8 desc( buffer->Des() );
     desc.Copy( iUserName );
     desc.Append(':');
-    desc.Append( iRealm->Des() );
+    desc.Append( realm );
     desc.Append(':');
     desc.Append( iPassword );
     Hash( *buffer, aResult );
-    CleanupStack::PopAndDestroy();  //buffer	
+    CleanupStack::PopAndDestroy();  //buffer
     }
 
 // ----------------------------------------------------------
diff -r 98b9acb58e02 -r 724b5986c132 xdmprotocols/XdmXmlParser/src/XdmXmlContentHandler.cpp
--- a/xdmprotocols/XdmXmlParser/src/XdmXmlContentHandler.cpp	Mon Mar 08 21:43:56 2010 +0000
+++ b/xdmprotocols/XdmXmlParser/src/XdmXmlContentHandler.cpp	Sun Mar 14 13:11:26 2010 +0000
@@ -254,7 +254,14 @@
                 }   
             }
         }
-    else iCurrentNode = iCurrentNode->Parent();
+    else if ( iCurrentNode ) 
+        {
+        iCurrentNode = iCurrentNode->Parent();
+        }
+    else
+        {
+        // For PC-lint note
+        }
     }
     
 // ---------------------------------------------------------