Commit cceb4c0a authored by Emmanuel Lepage's avatar Emmanuel Lepage

[#7038] Fix adding contact

parent 7f6412f4
...@@ -145,6 +145,27 @@ void AkonadiBackend::addNewContact(Contact* contact) ...@@ -145,6 +145,27 @@ void AkonadiBackend::addNewContact(Contact* contact)
newContact.setOrganization ( contact->getOrganization() ); newContact.setOrganization ( contact->getOrganization() );
//newContact.setPreferredEmail ( contact->getPreferredEmail() );//TODO //newContact.setPreferredEmail ( contact->getPreferredEmail() );//TODO
foreach (Contact::PhoneNumber* nb, contact->getPhoneNumbers()) {
KABC::PhoneNumber pn;
if (nb->getType() == "Home" ) pn.setType(KABC::PhoneNumber::Home );
else if (nb->getType() == "Work" ) pn.setType(KABC::PhoneNumber::Work );
else if (nb->getType() == "Msg" ) pn.setType(KABC::PhoneNumber::Msg );
else if (nb->getType() == "Pref" ) pn.setType(KABC::PhoneNumber::Pref );
else if (nb->getType() == "Voice" ) pn.setType(KABC::PhoneNumber::Voice );
else if (nb->getType() == "Fax" ) pn.setType(KABC::PhoneNumber::Fax );
else if (nb->getType() == "Cell" ) pn.setType(KABC::PhoneNumber::Cell );
else if (nb->getType() == "Video" ) pn.setType(KABC::PhoneNumber::Video );
else if (nb->getType() == "Bbs" ) pn.setType(KABC::PhoneNumber::Bbs );
else if (nb->getType() == "Modem" ) pn.setType(KABC::PhoneNumber::Modem );
else if (nb->getType() == "Car" ) pn.setType(KABC::PhoneNumber::Car );
else if (nb->getType() == "Isdn" ) pn.setType(KABC::PhoneNumber::Isdn );
else if (nb->getType() == "Pcs" ) pn.setType(KABC::PhoneNumber::Pcs );
else if (nb->getType() == "Pager" ) pn.setType(KABC::PhoneNumber::Pager );
pn.setNumber(nb->getNumber());
newContact.insertPhoneNumber(pn);
}
//aContact->setPhoneNumbers (newNumbers );//TODO //aContact->setPhoneNumbers (newNumbers );//TODO
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "sflphone_const.h" #include "sflphone_const.h"
Contact::Contact() Contact::Contact():m_pPhoto(0)
{ {
initItem(); initItem();
} }
......
...@@ -147,7 +147,8 @@ bool HistoryTreeItem::getContactInfo(QString phoneNumber) ...@@ -147,7 +147,8 @@ bool HistoryTreeItem::getContactInfo(QString phoneNumber)
{ {
Contact* contact = AkonadiBackend::getInstance()->getContactByPhone(phoneNumber); Contact* contact = AkonadiBackend::getInstance()->getContactByPhone(phoneNumber);
if (contact) { if (contact) {
labelIcon->setPixmap(*contact->getPhoto()); if (contact->getPhoto() != NULL)
labelIcon->setPixmap(*contact->getPhoto());
labelPeerName->setText("<b>"+contact->getFormattedName()+"</b>"); labelPeerName->setText("<b>"+contact->getFormattedName()+"</b>");
} }
else { else {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment