--- a/messagingapp/msgappfw/server/src/ccsconversationcachehelper.cpp Fri Jun 11 13:35:48 2010 +0300
+++ b/messagingapp/msgappfw/server/src/ccsconversationcachehelper.cpp Wed Jun 23 18:09:17 2010 +0300
@@ -29,7 +29,7 @@
#include "ccsconversationevent.h"
#include "ccscontactsmanager.h"
#include "ccscontactsresolver.h"
-#include "s60qconversions.h"
+#include <xqconversions.h>
#include "ccsdebug.h"
// ============================== MEMBER FUNCTIONS ============================
@@ -331,7 +331,7 @@
if (Contact)
{
QString contactAddress =
- S60QConversions::s60DescToQString(Contact->Des());
+ XQConversions::s60DescToQString(Contact->Des());
iConversationCache->ContactsManager()->resolver()->resolveContact(contactAddress,
contactDetail);
@@ -345,7 +345,7 @@
HBufC* displayName = NULL;
if(!contactDetail.displayName.isEmpty())
{
- displayName=S60QConversions::qStringToS60Desc(contactDetail.displayName);
+ displayName=XQConversions::qStringToS60Desc(contactDetail.displayName);
}
TRAPD(error, AddNewConversationL( aConverastionEvent->
ClientConversation()->GetConversationEntry(),
@@ -569,8 +569,9 @@
conversation->AddEntryL(aConversationEntry);
// fill firstname and lastname and contact Id
- conversation->AddContactDetailsL(aContactId,
- *aDisplayName);
+ if(aDisplayName)
+ conversation->AddContactDetailsL(aContactId,
+ aDisplayName);
// fill the phone number
if (aConversationEntry->Contact())