-rw-r--r-- | kabc/addressbook.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp index d03dea3..16e1653 100644 --- a/kabc/addressbook.cpp +++ b/kabc/addressbook.cpp | |||
@@ -450,6 +450,9 @@ void AddressBook::insertAddressee( const Addressee &a, bool setRev ) | |||
450 | Addressee::List::Iterator it; | 450 | Addressee::List::Iterator it; |
451 | for ( it = d->mAddressees.begin(); it != d->mAddressees.end(); ++it ) { | 451 | for ( it = d->mAddressees.begin(); it != d->mAddressees.end(); ++it ) { |
452 | if ( a.uid() == (*it).uid() ) { | 452 | if ( a.uid() == (*it).uid() ) { |
453 | if ( setRev && (*it).uid().left( 19 ) == QString("last-syncAddressee-") ) { | ||
454 | return; | ||
455 | } | ||
453 | bool changed = false; | 456 | bool changed = false; |
454 | Addressee addr = a; | 457 | Addressee addr = a; |
455 | if ( addr != (*it) ) | 458 | if ( addr != (*it) ) |
@@ -461,6 +464,7 @@ void AddressBook::insertAddressee( const Addressee &a, bool setRev ) | |||
461 | 464 | ||
462 | if ( changed ) { | 465 | if ( changed ) { |
463 | if ( setRev ) { | 466 | if ( setRev ) { |
467 | |||
464 | // get rid of micro seconds | 468 | // get rid of micro seconds |
465 | QDateTime dt = QDateTime::currentDateTime(); | 469 | QDateTime dt = QDateTime::currentDateTime(); |
466 | QTime t = dt.time(); | 470 | QTime t = dt.time(); |
@@ -525,7 +529,7 @@ Addressee::List AddressBook::getExternLastSyncAddressees() | |||
525 | 529 | ||
526 | Iterator it; | 530 | Iterator it; |
527 | for ( it = begin(); it != end(); ++it ) { | 531 | for ( it = begin(); it != end(); ++it ) { |
528 | if ( (*it).uid().left( 20 ) == "last-syncAddressee-" ) { | 532 | if ( (*it).uid().left( 19 ) == "last-syncAddressee-" ) { |
529 | if ( (*it).familyName().left(3) == "E: " ) | 533 | if ( (*it).familyName().left(3) == "E: " ) |
530 | results.append( *it ); | 534 | results.append( *it ); |
531 | } | 535 | } |
@@ -555,7 +559,8 @@ QStringList AddressBook:: uidList() | |||
555 | 559 | ||
556 | Addressee::List AddressBook::allAddressees() | 560 | Addressee::List AddressBook::allAddressees() |
557 | { | 561 | { |
558 | return d->mAddressees; | 562 | return d->mAddressees; |
563 | |||
559 | } | 564 | } |
560 | 565 | ||
561 | Addressee::List AddressBook::findByName( const QString &name ) | 566 | Addressee::List AddressBook::findByName( const QString &name ) |