# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1268649572 -7200
# Node ID bef90b82da7132e924a4a3b404bff768f06be698
# Parent  78867dafe7eb00662908a637ee2c0eb8189b6334
Revision: 201009
Kit: 201010

diff -r 78867dafe7eb -r bef90b82da71 imstatuspaneindicatorplugin/src/imstatuspaneindicatorpluginimplementation.cpp
--- a/imstatuspaneindicatorplugin/src/imstatuspaneindicatorpluginimplementation.cpp	Fri Mar 12 15:41:33 2010 +0200
+++ b/imstatuspaneindicatorplugin/src/imstatuspaneindicatorpluginimplementation.cpp	Mon Mar 15 12:39:32 2010 +0200
@@ -22,13 +22,13 @@
 #include <bautils.h>
 #include <f32file.h>
 #include <e32base.h>
-#include <BARSREAD.H>
+#include <barsread.h>
 #include <coemain.h>
 #include <eikenv.h>
 #include <apgcli.h>
 #include <avkon.hrh>
 
-#include <xspviewservices.h>
+#include <xSPViewServices.h>
 // imlauncher
 #include <imcvlauncher.h>
 
diff -r 78867dafe7eb -r bef90b82da71 imstatuspaneindicatorplugin/src/imstatuspaneindicatorproxy.cpp
--- a/imstatuspaneindicatorplugin/src/imstatuspaneindicatorproxy.cpp	Fri Mar 12 15:41:33 2010 +0200
+++ b/imstatuspaneindicatorplugin/src/imstatuspaneindicatorproxy.cpp	Mon Mar 15 12:39:32 2010 +0200
@@ -17,7 +17,7 @@
 #include "imstatuspaneindicatorpluginimplementation.h"
 #include "imstatuspaneindicatorpluginuids.h"
 
-#include <ImplementationProxy.h>
+#include <implementationproxy.h>
 
 // Define the interface UIDs
 const TImplementationProxy ImplementationTable[] =
diff -r 78867dafe7eb -r bef90b82da71 imstutils/imconversationview/imcvuiapp/rss/imcvuiapp.rss
--- a/imstutils/imconversationview/imcvuiapp/rss/imcvuiapp.rss	Fri Mar 12 15:41:33 2010 +0200
+++ b/imstutils/imconversationview/imcvuiapp/rss/imcvuiapp.rss	Mon Mar 15 12:39:32 2010 +0200
@@ -34,9 +34,9 @@
 #include <aknsconstants.hrh>
 #include "imcvappsmileutility.hrh"
 #include "imcvappsmileutility.rh"
-#include <aiwcommon.rh>
-#include <aiwcommon.hrh>
-#include <aiwgenericparam.hrh>
+#include <AiwCommon.rh>
+#include <AiwCommon.hrh>
+#include <AiwGenericParam.hrh>
 
 
 // ---------------------------------------------------------
diff -r 78867dafe7eb -r bef90b82da71 imstutils/imconversationview/imcvuiapp/src/cimcvappsmileicondialog.cpp
--- a/imstutils/imconversationview/imcvuiapp/src/cimcvappsmileicondialog.cpp	Fri Mar 12 15:41:33 2010 +0200
+++ b/imstutils/imconversationview/imcvuiapp/src/cimcvappsmileicondialog.cpp	Mon Mar 15 12:39:32 2010 +0200
@@ -25,11 +25,11 @@
 #include "imcvappsmileutility.hrh"
 #include <AknDef.h>
 #include <aknappui.h>
-#include <aknutils.h>
+#include <AknUtils.h>
 #include <aknconsts.h>
 #include <aknborders.h>
 #include <AknsDrawUtils.h>
-#include <AknLayoutScalable_Avkon.cdl.h>
+#include <aknlayoutscalable_avkon.cdl.h>
 #include <aknlists.h> 
 #include <AknUtils.h> 
 #include "imcvlogger.h"
diff -r 78867dafe7eb -r bef90b82da71 imstutils/imconversationview/imcvuiapp/src/cimcvappview.cpp
--- a/imstutils/imconversationview/imcvuiapp/src/cimcvappview.cpp	Fri Mar 12 15:41:33 2010 +0200
+++ b/imstutils/imconversationview/imcvuiapp/src/cimcvappview.cpp	Mon Mar 15 12:39:32 2010 +0200
@@ -71,13 +71,13 @@
 #include <e32property.h>
 
 // AIW Include Files 
-#include <aiwgenericparam.h>            
-#include <aiwcontactassigndatatypes.h>
+#include <AiwGenericParam.h>            
+#include <AiwContactAssignDataTypes.h>
 #include <aiwdialdataext.h>
-#include <aiwcommon.hrh>
-#include <aiwservicehandler.h>
+#include <AiwCommon.hrh>
+#include <AiwServiceHandler.h>
 #include <aiwdialdata.h>
-#include <CommonPhoneParser.h>
+#include <commonphoneparser.h>
 
 
 // Dll Uid of vimpstui, to maintain uniqueness of help uid
@@ -585,21 +585,17 @@
 	else
 		{
 		TPtrC activeRecipientId = iEngineFactory->GetActiveItemL ();
-		iActiveEngine->MessageHandler().StartNewConversationL (activeRecipientId);
-		SetStatusPaneIconsL();
-		if (iStatusPane)
+		if(activeRecipientId.Length())
 		    {
-		    iStatusPane->BringToForegroundL();
-		    }		
-		iViewDeactivated = EFalse;	
+            iActiveEngine->MessageHandler().StartNewConversationL (activeRecipientId);
+            SetStatusPaneIconsL();
+            if (iStatusPane)
+                {
+                iStatusPane->BringToForegroundL();
+                }       
+            iViewDeactivated = EFalse;
+		    }
 		}			    	
-
-    if( iContainer )
-        {
-        //don't read messages if we're not in foreground
-     //   iContainer->FetchMessages( aForeground );
-        }
-        
     IM_CV_LOGS(TXT("CIMCVAppView::HandleForegroundEventL() end") );
     }
 
@@ -1422,8 +1418,24 @@
                 if (KErrNone != aReason)
                     IMCVUiAppNoteMapper::ShowNoteL( aReason , KNullDesC );
                 }
-			// This will be deleted by Engine factory later.
-			//iActiveEngine = NULL;
+            // if application is in the background, then on logout
+            // clean up the container, and if the cca was open then close.
+            // only for the logged out service.
+            if( aServiceId == iServiceId )
+                {
+                if(iConnection)
+                       {
+                       iConnection->Close();
+                       iConnection = NULL;
+                       }
+                if(iViewDeactivated)
+                       {
+                       ViewRefreshL();
+                       // set this to KNullDesC since conversation is getting closed.
+                       iRecipientUserId->Des().Copy( KNullDesC());
+                       }
+                }
+           
 			break;
             }
         }
diff -r 78867dafe7eb -r bef90b82da71 instantmessagesalert/tsrc/testinstantmsgalert/group/testinstantmsgalert_DoxyFile.txt
--- a/instantmessagesalert/tsrc/testinstantmsgalert/group/testinstantmsgalert_DoxyFile.txt	Fri Mar 12 15:41:33 2010 +0200
+++ b/instantmessagesalert/tsrc/testinstantmsgalert/group/testinstantmsgalert_DoxyFile.txt	Mon Mar 15 12:39:32 2010 +0200
@@ -1,8 +1,7 @@
-#
 # Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
@@ -11,7 +10,8 @@
 #
 # Contributors:
 # 
-# Description:
+# Description: MMP file for STIF Test Framework's TestScripter 
+# testclass test module.
 #
 #
 
diff -r 78867dafe7eb -r bef90b82da71 servicewidget/servicewidgetdatapublisher/inc/cservicewidgetcontentpublisher.h
--- a/servicewidget/servicewidgetdatapublisher/inc/cservicewidgetcontentpublisher.h	Fri Mar 12 15:41:33 2010 +0200
+++ b/servicewidget/servicewidgetdatapublisher/inc/cservicewidgetcontentpublisher.h	Mon Mar 15 12:39:32 2010 +0200
@@ -21,8 +21,8 @@
 #define CSERVICEWIDGETCONTENTPUBLISHER_H
 
 #include <liwservicehandler.h>
-#include <LiwVariant.h>
-#include <LiwGenericParam.h>
+#include <liwvariant.h>
+#include <liwgenericparam.h>
 #include "servicewidgetcpglobals.h"
 #include "mservicewidgetobservers.h"
 
diff -r 78867dafe7eb -r bef90b82da71 servicewidget/servicewidgetdatapublisher/src/cservicewidgetcontentpublisher.cpp
--- a/servicewidget/servicewidgetdatapublisher/src/cservicewidgetcontentpublisher.cpp	Fri Mar 12 15:41:33 2010 +0200
+++ b/servicewidget/servicewidgetdatapublisher/src/cservicewidgetcontentpublisher.cpp	Mon Mar 15 12:39:32 2010 +0200
@@ -18,17 +18,17 @@
 
 #include "cservicewidgetcontentpublisher.h"
 
-#include <LiwServiceHandler.h>
-#include <LiwVariant.h>
-#include <LiwGenericParam.h>
+#include <liwservicehandler.h>
+#include <liwvariant.h>
+#include <liwgenericparam.h>
 #include <avkon.hrh>
 #include <aknnotewrappers.h> 
 #include "swpdebugtrace.h"
 
-#include <LiwCommon.h>
+#include <liwcommon.h>
 #include "servicewidgetcpglobals.h"
 #include <servicewidgetpluginres.rsg>
-#include <stringloader.h>
+#include <StringLoader.h>
 
 // ---------------------------------------------------------------------------
 // CServiceWidgetContentPublisher::CServiceWidgetContentPublisher
diff -r 78867dafe7eb -r bef90b82da71 uiservicetab/vimpstcmdprocess/inc/cvimpstprocessarrayitem.h
--- a/uiservicetab/vimpstcmdprocess/inc/cvimpstprocessarrayitem.h	Fri Mar 12 15:41:33 2010 +0200
+++ b/uiservicetab/vimpstcmdprocess/inc/cvimpstprocessarrayitem.h	Mon Mar 15 12:39:32 2010 +0200
@@ -23,7 +23,7 @@
 #define CVIMPSTPROCESSARRAYITEM_H
 #include <e32base.h>
 
-#include "TVIMPSTEnums.h"
+#include "tvimpstenums.h"
 #include "cvimpstprocessarray.h"
 //  FORWARD DECLARATION
 class MVPbkContactLink;
diff -r 78867dafe7eb -r bef90b82da71 uiservicetab/vimpstcmdprocess/inc/cvimpstprocessfriendrequestitem.h
--- a/uiservicetab/vimpstcmdprocess/inc/cvimpstprocessfriendrequestitem.h	Fri Mar 12 15:41:33 2010 +0200
+++ b/uiservicetab/vimpstcmdprocess/inc/cvimpstprocessfriendrequestitem.h	Mon Mar 15 12:39:32 2010 +0200
@@ -21,7 +21,7 @@
 #define CVIMPSTPROCESSFRIENDREQUESTITEM_H_
 
 #include <e32base.h>
-#include "TVIMPSTEnums.h"
+#include "tvimpstenums.h"
 #include "cvimpstprocessarrayitem.h"
 
 //  CLASS DECLARATION
diff -r 78867dafe7eb -r bef90b82da71 uiservicetab/vimpstcmdprocess/src/cvimpstprocessArray.cpp
--- a/uiservicetab/vimpstcmdprocess/src/cvimpstprocessArray.cpp	Fri Mar 12 15:41:33 2010 +0200
+++ b/uiservicetab/vimpstcmdprocess/src/cvimpstprocessArray.cpp	Mon Mar 15 12:39:32 2010 +0200
@@ -22,10 +22,10 @@
 
 #include "cvimpstprocessarray.h"
 
-#include "mvimpstprocessarrayobserver.h"
+#include "mvimpstprocessArrayobserver.h"
 #include "cvimpststoragemanagerfactory.h"
 #include "mvimpststorageserviceview.h"
-#include "TVIMPSTEnums.h"
+#include "tvimpstenums.h"
 #include "cvimpstprocessarrayitem.h"
 #include "mvimpststorageitemmodel.h"
 #include "tvimpstconsts.h"
@@ -34,18 +34,18 @@
 #include "mvimpstengine.h"
 #include "cvimpstprocessfriendrequestitem.h"
 #include "mvimpstenginesubservice.h"
-#include <mvpbkfieldtype.h>
-#include <mvpbkcontactfielduridata.h>
+#include <MVPbkFieldType.h>
+#include <MVPbkContactFieldUriData.h>
 #include <MVPbkContactFieldTextData.h>
 //rsg file for resource id
 #include <vimpstuires.rsg>
 #include "vimpstutils.h"
-#include <mvpbkcontactlink.h>
-#include <vpbkeng.rsg>
+#include <MVPbkContactLink.h>
+#include <VPbkEng.rsg>
 #include "mvimpstengineimsubservice.h"
 #include "mvimpstenginepresencesubservice.h"
 #include "vimpstdebugtrace.h"
-#include <APGTASK.H> 
+#include <apgtask.h> 
 #include "imcvuiparams.h"
 
 // --------------------------------------------------------------------------
@@ -136,14 +136,14 @@
     if(iContactInterface)
         {        
         iContactInterface->AddObserverL( this );// listen these events..        
+        HBufC* unnamed = VIMPSTUtils::LoadResourceL( R_SERVTAB_UNNAMED );
+        if( unnamed )
+            {
+            CleanupStack::PushL( unnamed );
+            iContactInterface->SetUnnamedTextL(unnamed); // takes ownership
+            CleanupStack::Pop( unnamed );	
+            }
         }
-    HBufC* unnamed = VIMPSTUtils::LoadResourceL( R_SERVTAB_UNNAMED );
-    if( unnamed )
-	    {
-	    CleanupStack::PushL( unnamed );
-	    iContactInterface->SetUnnamedTextL(unnamed); // takes ownership
-	    CleanupStack::Pop( unnamed );	
-	    }
     iContactListModel = CVIMPSTStorageManagerFactory::ItemModelInterfaceL(iServiceId);
     iLoginState = iEngine.ServiceState();
     
@@ -494,57 +494,61 @@
             TRACE( T_LIT("itemarraycount = %d"),iItemArray.Count() );
             if( aContactIndex < iItemArray.Count() )
                 {
-                CVIMPSTProcessContactItem* newItem = CVIMPSTProcessContactItem::NewL(*this, const_cast<TDesC&>(aContact->Name() ),
-                        const_cast<TDesC&>(aContact->UserId() ),
-                        aContact->ContactLink(),
-                        const_cast<TDesC&>(aContact->StatusText()),
-                        aContact->OnlineStatus() );
-                
+                if ( aContact )
+                     {
+                    CVIMPSTProcessContactItem* newItem = CVIMPSTProcessContactItem::NewL(*this, const_cast<TDesC&>(aContact->Name() ),
+                            const_cast<TDesC&>(aContact->UserId() ),
+                            aContact->ContactLink(),
+                            const_cast<TDesC&>(aContact->StatusText()),
+                            aContact->OnlineStatus() );
+                    
+                    
+                    MVIMPSTProcessArrayItem* oldItem = iItemArray[ aContactIndex ];
+                    newItem->SetAvatarIndex(aContact->AvatarIndex()); // copy the avatar index too.
+                    TRACE( T_LIT("contact removed in item array of index = %d"),aContactIndex );
+                    // set the conversation open flag from old contact, as only the display name would have changed.
+                    newItem->SetConversationOpen(oldItem->IsConversationOpen());
+                    newItem->SetMsgPending( oldItem->IsMsgPending() );
+                    iItemArray.Remove(aContactIndex );
+                    delete oldItem;
+                    iItemArray.Compress();
+                    TRACE( T_LIT("Insert at index = %d"), aContactIndex);
+                    TInt newIndex = iContactListModel->IndexOfContact( aContact );
+                     // Add it in the new index
+                    newIndex = newIndex + 1 + iUnKnownContactArray.Count() + iAddRequestArray.Count();
+                    if (newIndex >= iItemArray.Count())
+                        {
+                        TRACE( T_LIT("append contact item = %d"), newIndex);
+                        iItemArray.Append (newItem);
+                        }
+                    else
+                        {
+                        TRACE( T_LIT("Insert at index = %d"), newItem);
+                        iItemArray.Insert(newItem, newIndex);
+                        } 
+                    // inform the cv about the display name changes
+                    if(aContact && aContact->UserId().Length() && newItem->IsConversationOpen())
+                        {
+                        TRACE( T_LIT("CVIMPSTProcessArray::HandleStorageChangeL EStorageEventContactChange "));
+                        TApaTaskList taskList( CCoeEnv::Static()->WsSession() );
+                        TApaTask task( taskList.FindApp( KConversationViewAppUid ) );
+                    
+                        if ( task.Exists() )
+                            {
+                            TRACE( T_LIT("CVIMPSTProcessArray::HandleStorageChangeL EStorageEventContactChange:task exists"));
+                            // packing of data ,passed to conversation view
+                            TPckgBuf< TIMCVUiParams > params;
+                            params().iBuddyId = aContact->UserId();
+                            params().iBuddyName = aContact->Name();
+                            params().iServiceId = iServiceId;
+                            params().iUpdate = ETrue;
+                            task.SendMessage( 
+                                    TUid::Uid( KUidApaMessageSwitchOpenFileValue ), params );
+                            }
+                        }
+                    } 
                 
-                MVIMPSTProcessArrayItem* oldItem = iItemArray[ aContactIndex ];
-                newItem->SetAvatarIndex(aContact->AvatarIndex()); // copy the avatar index too.
-                TRACE( T_LIT("contact removed in item array of index = %d"),aContactIndex );
-                // set the conversation open flag from old contact, as only the display name would have changed.
-                newItem->SetConversationOpen(oldItem->IsConversationOpen());
-                newItem->SetMsgPending( oldItem->IsMsgPending() );
-                iItemArray.Remove(aContactIndex );
-                delete oldItem;
-                iItemArray.Compress();
-                TRACE( T_LIT("Insert at index = %d"), aContactIndex);
-                TInt newIndex = iContactListModel->IndexOfContact( aContact );
-                 // Add it in the new index
-                newIndex = newIndex + 1 + iUnKnownContactArray.Count() + iAddRequestArray.Count();
-                if (newIndex >= iItemArray.Count())
-                    {
-                    TRACE( T_LIT("append contact item = %d"), newIndex);
-                    iItemArray.Append (newItem);
-                    }
-                else
-                    {
-                    TRACE( T_LIT("Insert at index = %d"), newItem);
-                    iItemArray.Insert(newItem, newIndex);
-                    } 
-                // inform the cv about the display name changes
-                if(aContact && aContact->UserId().Length() && newItem->IsConversationOpen())
-                    {
-                    TRACE( T_LIT("CVIMPSTProcessArray::HandleStorageChangeL EStorageEventContactChange "));
-                    TApaTaskList taskList( CCoeEnv::Static()->WsSession() );
-                    TApaTask task( taskList.FindApp( KConversationViewAppUid ) );
-
-                    if ( task.Exists() )
-                        {
-                        TRACE( T_LIT("CVIMPSTProcessArray::HandleStorageChangeL EStorageEventContactChange:task exists"));
-                        // packing of data ,passed to conversation view
-                        TPckgBuf< TIMCVUiParams > params;
-                        params().iBuddyId = aContact->UserId();
-                        params().iBuddyName = aContact->Name();
-                        params().iServiceId = iServiceId;
-                        params().iUpdate = ETrue;
-                        task.SendMessage( 
-                                TUid::Uid( KUidApaMessageSwitchOpenFileValue ), params );
-                        }
-                    }
-                }
+              }
             if(iProcessObservers )
                 {
                 iProcessObservers->HandleAdditionL(TVIMPSTEnums::EContactItem, aContactIndex );
diff -r 78867dafe7eb -r bef90b82da71 uiservicetab/vimpstcmdprocess/src/cvimpstprocessarrayitem.cpp
--- a/uiservicetab/vimpstcmdprocess/src/cvimpstprocessarrayitem.cpp	Fri Mar 12 15:41:33 2010 +0200
+++ b/uiservicetab/vimpstcmdprocess/src/cvimpstprocessarrayitem.cpp	Mon Mar 15 12:39:32 2010 +0200
@@ -21,7 +21,7 @@
 #include "tvimpstconsts.h"
 #include "vimpstutils.h"
 #include <vimpstuires.rsg>
-#include <stringloader.h>
+#include <StringLoader.h>
 
 
 const TInt KAvtarLength = 3;
diff -r 78867dafe7eb -r bef90b82da71 uiservicetab/vimpstcmdprocess/src/cvimpstprocessfriendrequestitem.cpp
--- a/uiservicetab/vimpstcmdprocess/src/cvimpstprocessfriendrequestitem.cpp	Fri Mar 12 15:41:33 2010 +0200
+++ b/uiservicetab/vimpstcmdprocess/src/cvimpstprocessfriendrequestitem.cpp	Mon Mar 15 12:39:32 2010 +0200
@@ -18,7 +18,7 @@
 #include "cvimpstprocessfriendrequestitem.h"
 #include "vimpstutils.h"
 #include <vimpstuires.rsg>
-#include <stringloader.h>
+#include <StringLoader.h>
 #include "tvimpstconsts.h"
 
 
diff -r 78867dafe7eb -r bef90b82da71 uiservicetab/vimpstcmdprocess/tsrc/vimpstcmdprocess_utest/inc/s_vimpstprocessarrayItem.h
--- a/uiservicetab/vimpstcmdprocess/tsrc/vimpstcmdprocess_utest/inc/s_vimpstprocessarrayItem.h	Fri Mar 12 15:41:33 2010 +0200
+++ b/uiservicetab/vimpstcmdprocess/tsrc/vimpstcmdprocess_utest/inc/s_vimpstprocessarrayItem.h	Mon Mar 15 12:39:32 2010 +0200
@@ -136,6 +136,14 @@
         {
         
         }
+        
+   /**
+     * return formatted string needed for listbox for this item
+     */
+    void  DoFormatStringL()
+        {
+        
+        }
     
     private:
     
diff -r 78867dafe7eb -r bef90b82da71 uiservicetab/vimpstengine/src/cvimpstengine.cpp
--- a/uiservicetab/vimpstengine/src/cvimpstengine.cpp	Fri Mar 12 15:41:33 2010 +0200
+++ b/uiservicetab/vimpstengine/src/cvimpstengine.cpp	Mon Mar 15 12:39:32 2010 +0200
@@ -725,7 +725,23 @@
 		//the context gets binded
 		//Get Presence SubService   
 		CVIMPSTEnginePresenceSubService* presSubService = 
-									dynamic_cast<CVIMPSTEnginePresenceSubService*>(SubService(TVIMPSTEnums::EPresence));               
+									dynamic_cast<CVIMPSTEnginePresenceSubService*>(SubService(TVIMPSTEnums::EPresence));     
+		// in case of roaming(moving from one network to another)
+		// servicetab goes from registered to connecting state, hence the unbind is done here.
+    if (  presSubService && TVIMPSTEnums::ESVCERegistered == previousState &&
+          TVIMPSTEnums::ESVCENetworkConnecting == iState )
+          {
+          TRACE( T_LIT( "HandleServceConnectionEventL()-UnsubscribeLists" ) );
+          
+          TRAPD( err, presSubService->UnsubscribeListsL() );
+	  
+          TRACE( T_LIT( "HandleServceConnectionEventL()-UnsubscribeLists -err: %d" ), err );
+	  
+          if ( iSessionCntxtObserver )
+              {
+              iSessionCntxtObserver->ServerUnBindL( ETrue );
+              }
+          }          
 		TInt count = iObserverArray.Count();
 		for (TInt index=0; index<count; index++)		
 			{
diff -r 78867dafe7eb -r bef90b82da71 uiservicetab/vimpstengine/src/cvimpstenginecvlistener.cpp
--- a/uiservicetab/vimpstengine/src/cvimpstenginecvlistener.cpp	Fri Mar 12 15:41:33 2010 +0200
+++ b/uiservicetab/vimpstengine/src/cvimpstenginecvlistener.cpp	Mon Mar 15 12:39:32 2010 +0200
@@ -92,9 +92,11 @@
     // resubscribe before processing new value to prevent missing updates
     //TBuf <KMaxSerIdXspIdLen> serId_usrId;
     HBufC16* serId_usrId = HBufC16::NewLC(KMaxSerIdXspIdLen);
-    TPtr serId_usrIdPtr(serId_usrId->Des());
-    
-    iProperty.Get(KConvViewUID,KXspIdServiceIDKey,serId_usrIdPtr);
+    if ( serId_usrId )
+        {
+        TPtr serId_usrIdPtr(serId_usrId->Des());
+        iProperty.Get(KConvViewUID,KXspIdServiceIDKey,serId_usrIdPtr);
+        }
     // parse the service id and userid form the buf and get the 
     // contactlink and first name and publish it.
     TInt posOfDelimiter  = serId_usrId->Find(KDelimiter);
@@ -170,7 +172,11 @@
             }
         CleanupStack::PopAndDestroy( &supportedServices );
         }
-    CleanupStack::PopAndDestroy( serId_usrId );
+        
+    if(serId_usrId)
+    		{
+    		CleanupStack::PopAndDestroy( serId_usrId );
+    		}  
     iProperty.Subscribe( iStatus );
     SetActive();
     TRACE( T_LIT("CVIMPSTEngineCVListener::RunL() end"));
diff -r 78867dafe7eb -r bef90b82da71 uiservicetab/vimpststorage/tsrc/vimpststorage_ut/cvimpststoragecontact_ut/group/CVIMPSTStorageContact_UT_DoxyFile.txt
--- a/uiservicetab/vimpststorage/tsrc/vimpststorage_ut/cvimpststoragecontact_ut/group/CVIMPSTStorageContact_UT_DoxyFile.txt	Fri Mar 12 15:41:33 2010 +0200
+++ b/uiservicetab/vimpststorage/tsrc/vimpststorage_ut/cvimpststoragecontact_ut/group/CVIMPSTStorageContact_UT_DoxyFile.txt	Mon Mar 15 12:39:32 2010 +0200
@@ -1,8 +1,7 @@
-#
 # Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
@@ -11,7 +10,8 @@
 #
 # Contributors:
 # 
-# Description:
+# Description: MMP file for STIF Test Framework's TestScripter 
+# testclass test module.
 #
 #
 
diff -r 78867dafe7eb -r bef90b82da71 uiservicetab/vimpststorage/tsrc/vimpststorage_ut/cvimpststoragecontactsorter_ut/group/CVIMPSTStorageContactSorter_UT_DoxyFile.txt
--- a/uiservicetab/vimpststorage/tsrc/vimpststorage_ut/cvimpststoragecontactsorter_ut/group/CVIMPSTStorageContactSorter_UT_DoxyFile.txt	Fri Mar 12 15:41:33 2010 +0200
+++ b/uiservicetab/vimpststorage/tsrc/vimpststorage_ut/cvimpststoragecontactsorter_ut/group/CVIMPSTStorageContactSorter_UT_DoxyFile.txt	Mon Mar 15 12:39:32 2010 +0200
@@ -1,8 +1,7 @@
-#
 # Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
@@ -11,7 +10,8 @@
 #
 # Contributors:
 # 
-# Description:
+# Description: MMP file for STIF Test Framework's TestScripter 
+# testclass test module.
 #
 #
 
diff -r 78867dafe7eb -r bef90b82da71 uiservicetab/vimpstui/src/cvimpstuiblockview.cpp
--- a/uiservicetab/vimpstui/src/cvimpstuiblockview.cpp	Fri Mar 12 15:41:33 2010 +0200
+++ b/uiservicetab/vimpstui/src/cvimpstuiblockview.cpp	Mon Mar 15 12:39:32 2010 +0200
@@ -36,7 +36,7 @@
 #include <MPbk2ViewExplorer.h>
 #include <MPbk2StartupMonitor.h>
 #include <eikmenup.h>
-#include <aiwcommon.hrh>
+#include <AiwCommon.hrh>
 //resource
 #include <vimpstuires.rsg>
 #include <ExtensionManagerRes.rsg>
diff -r 78867dafe7eb -r bef90b82da71 uiservicetab/vimpstui/src/cvimpstuitabbedview.cpp
--- a/uiservicetab/vimpstui/src/cvimpstuitabbedview.cpp	Fri Mar 12 15:41:33 2010 +0200
+++ b/uiservicetab/vimpstui/src/cvimpstuitabbedview.cpp	Mon Mar 15 12:39:32 2010 +0200
@@ -102,7 +102,7 @@
 #include <MVPbkStoreContact.h>
 
 //browser launch
-#include <BrowserLauncher.h>
+#include <browserlauncher.h>
 #include "cvimpstuitermsofusedialoghandler.h"
 #include <cvimpstsettingsstore.h>
 #include <aknmessagequerydialog.h>