| author | zautrix <zautrix> | 2004-10-15 14:26:07 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2004-10-15 14:26:07 (UTC) |
| commit | 4f276d80bd977401d656851515474cc00c661e5b (patch) (side-by-side diff) | |
| tree | 0d3a747bef0431ef791b69876f5bda554f9ca83f /kabc | |
| parent | c2fb960297c4b08980921c818a4d347057732390 (diff) | |
| download | kdepimpi-4f276d80bd977401d656851515474cc00c661e5b.zip kdepimpi-4f276d80bd977401d656851515474cc00c661e5b.tar.gz kdepimpi-4f276d80bd977401d656851515474cc00c661e5b.tar.bz2 | |
many phone and sync fixes
| -rw-r--r-- | kabc/addressee.cpp | 1 | ||||
| -rw-r--r-- | kabc/kabc.pro | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp index 2564894..40877ef 100644 --- a/kabc/addressee.cpp +++ b/kabc/addressee.cpp @@ -307,12 +307,13 @@ void Addressee::mergeContact( const Addressee& ad , bool isSubSet) // = false) bool found = false; PhoneNumber::List::Iterator it; for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) { if ( ( *phoneItAD ).contains( (*it) ) ) { found = true; (*it).setType( ( *phoneItAD ).type() ); + (*it).setNumber( ( *phoneItAD ).number() ); break; } } if ( isSubSet && ! found ) mData->phoneNumbers.append( *phoneItAD ); } diff --git a/kabc/kabc.pro b/kabc/kabc.pro index d690acc..17ebff8 100644 --- a/kabc/kabc.pro +++ b/kabc/kabc.pro @@ -45,13 +45,12 @@ distributionlisteditor.h \ vcardformatplugin.h \ formats/vcardformatplugin2.h \ picture.h \ secrecy.h \ sound.h \ addressbook.h \ - syncprefwidget.h \ timezone.h \ tmpaddressbook.h \ addressee.h \ addresseedialog.h \ vcardconverter.h \ vcard21parser.h \ @@ -157,13 +156,12 @@ formatfactory.cpp \ address.cpp \ phonenumber.cpp \ picture.cpp \ secrecy.cpp \ sound.cpp \ addressbook.cpp \ - syncprefwidget.cpp \ timezone.cpp \ tmpaddressbook.cpp \ addressee.cpp \ addresseelist.cpp \ addresseedialog.cpp \ vcardconverter.cpp \ |