| author | zautrix <zautrix> | 2004-09-18 17:25:46 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2004-09-18 17:25:46 (UTC) |
| commit | 3f16c7aa0ab6badf304c537a6981ece743138821 (patch) (side-by-side diff) | |
| tree | 1dda326a1025477c7dd1a284609fa108da4e2e1d /kabc/addressbook.cpp | |
| parent | a355a58898d0d08d797f872751254cfa958387c1 (diff) | |
| download | kdepimpi-3f16c7aa0ab6badf304c537a6981ece743138821.zip kdepimpi-3f16c7aa0ab6badf304c537a6981ece743138821.tar.gz kdepimpi-3f16c7aa0ab6badf304c537a6981ece743138821.tar.bz2 | |
sync fixes
| -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 ) Addressee::List::Iterator it; for ( it = d->mAddressees.begin(); it != d->mAddressees.end(); ++it ) { if ( a.uid() == (*it).uid() ) { + if ( setRev && (*it).uid().left( 19 ) == QString("last-syncAddressee-") ) { + return; + } bool changed = false; Addressee addr = a; if ( addr != (*it) ) @@ -461,6 +464,7 @@ void AddressBook::insertAddressee( const Addressee &a, bool setRev ) if ( changed ) { if ( setRev ) { + // get rid of micro seconds QDateTime dt = QDateTime::currentDateTime(); QTime t = dt.time(); @@ -525,7 +529,7 @@ Addressee::List AddressBook::getExternLastSyncAddressees() Iterator it; for ( it = begin(); it != end(); ++it ) { - if ( (*it).uid().left( 20 ) == "last-syncAddressee-" ) { + if ( (*it).uid().left( 19 ) == "last-syncAddressee-" ) { if ( (*it).familyName().left(3) == "E: " ) results.append( *it ); } @@ -555,7 +559,8 @@ QStringList AddressBook:: uidList() Addressee::List AddressBook::allAddressees() { - return d->mAddressees; + return d->mAddressees; + } Addressee::List AddressBook::findByName( const QString &name ) |