equal
deleted
inserted
replaced
27 #include "ccsconversation.h" |
27 #include "ccsconversation.h" |
28 #include "ccsconversationentry.h" |
28 #include "ccsconversationentry.h" |
29 #include "ccsconversationevent.h" |
29 #include "ccsconversationevent.h" |
30 #include "ccscontactsmanager.h" |
30 #include "ccscontactsmanager.h" |
31 #include "ccscontactsresolver.h" |
31 #include "ccscontactsresolver.h" |
32 #include "s60qconversions.h" |
32 #include <xqconversions.h> |
33 #include "ccsdebug.h" |
33 #include "ccsdebug.h" |
34 |
34 |
35 // ============================== MEMBER FUNCTIONS ============================ |
35 // ============================== MEMBER FUNCTIONS ============================ |
36 |
36 |
37 // ---------------------------------------------------------------------------- |
37 // ---------------------------------------------------------------------------- |
329 { |
329 { |
330 HBufC* Contact = ConvEntry->Contact(); |
330 HBufC* Contact = ConvEntry->Contact(); |
331 if (Contact) |
331 if (Contact) |
332 { |
332 { |
333 QString contactAddress = |
333 QString contactAddress = |
334 S60QConversions::s60DescToQString(Contact->Des()); |
334 XQConversions::s60DescToQString(Contact->Des()); |
335 |
335 |
336 iConversationCache->ContactsManager()->resolver()->resolveContact(contactAddress, |
336 iConversationCache->ContactsManager()->resolver()->resolveContact(contactAddress, |
337 contactDetail); |
337 contactDetail); |
338 |
338 |
339 int contactId = contactDetail.contactId; |
339 int contactId = contactDetail.contactId; |
343 { |
343 { |
344 // Add as new conversation |
344 // Add as new conversation |
345 HBufC* displayName = NULL; |
345 HBufC* displayName = NULL; |
346 if(!contactDetail.displayName.isEmpty()) |
346 if(!contactDetail.displayName.isEmpty()) |
347 { |
347 { |
348 displayName=S60QConversions::qStringToS60Desc(contactDetail.displayName); |
348 displayName=XQConversions::qStringToS60Desc(contactDetail.displayName); |
349 } |
349 } |
350 TRAPD(error, AddNewConversationL( aConverastionEvent-> |
350 TRAPD(error, AddNewConversationL( aConverastionEvent-> |
351 ClientConversation()->GetConversationEntry(), |
351 ClientConversation()->GetConversationEntry(), |
352 contactId, |
352 contactId, |
353 displayName)); |
353 displayName)); |
567 |
567 |
568 // add the conversation entry |
568 // add the conversation entry |
569 conversation->AddEntryL(aConversationEntry); |
569 conversation->AddEntryL(aConversationEntry); |
570 |
570 |
571 // fill firstname and lastname and contact Id |
571 // fill firstname and lastname and contact Id |
572 conversation->AddContactDetailsL(aContactId, |
572 if(aDisplayName) |
573 *aDisplayName); |
573 conversation->AddContactDetailsL(aContactId, |
|
574 aDisplayName); |
574 |
575 |
575 // fill the phone number |
576 // fill the phone number |
576 if (aConversationEntry->Contact()) |
577 if (aConversationEntry->Contact()) |
577 { |
578 { |
578 conversation->AddContactDetailsL(* (aConversationEntry->Contact())); |
579 conversation->AddContactDetailsL(* (aConversationEntry->Contact())); |