jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

[#7038] Fix adding contact

Browse Source
This commit is contained in:
Emmanuel Lepage
2011-09-26 14:29:19 -04:00
parent 7f6412f45c
commit cceb4c0a3a
3 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
kde/src/AkonadiBackend.cpp
View File

@ -145,6 +145,27 @@ void AkonadiBackend::addNewContact(Contact* contact)
newContact.setOrganization ( contact->getOrganization() );
//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

2
kde/src/lib/Contact.cpp
View File

@ -25,7 +25,7 @@
#include "sflphone_const.h"
Contact::Contact()
Contact::Contact():m_pPhoto(0)
{
initItem();
}

3
kde/src/widgets/HistoryTreeItem.cpp
View File

@ -147,7 +147,8 @@ bool HistoryTreeItem::getContactInfo(QString phoneNumber)
{
Contact* contact = AkonadiBackend::getInstance()->getContactByPhone(phoneNumber);
if (contact) {
labelIcon->setPixmap(*contact->getPhoto());
if (contact->getPhoto() != NULL)
labelIcon->setPixmap(*contact->getPhoto());
labelPeerName->setText("<b>"+contact->getFormattedName()+"</b>");
}
else {