| author | zautrix <zautrix> | 2004-10-27 20:17:45 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2004-10-27 20:17:45 (UTC) |
| commit | 3d6ae51e66bafaa4b51ed43d2e72a42802669212 (patch) (side-by-side diff) | |
| tree | 86528ba48c05dcb8f575785c63f591e840a86d95 /kabc/addressbook.cpp | |
| parent | bb82cac85cc196b3f60921ab27e84204036b54b8 (diff) | |
| download | kdepimpi-3d6ae51e66bafaa4b51ed43d2e72a42802669212.zip kdepimpi-3d6ae51e66bafaa4b51ed43d2e72a42802669212.tar.gz kdepimpi-3d6ae51e66bafaa4b51ed43d2e72a42802669212.tar.bz2 | |
sync fixes
| -rw-r--r-- | kabc/addressbook.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp index 5774c36..6194d6d 100644 --- a/kabc/addressbook.cpp +++ b/kabc/addressbook.cpp @@ -872,17 +872,17 @@ void AddressBook::removeSyncAddressees( bool removeDeleted ) //qDebug("removing %s ",(*it).uid().latin1() ); ++it; removeAddressee( it2 ); } else { //qDebug("skipping %s ",(*it).uid().latin1() ); if ( removeDeleted ) { // we have no postprocessing in the resource, we have to do it here // we have to compute csum for all, because it could be the first sync - (*it).setTempSyncStat( SYNC_TEMPSTATE_NEW_CSUM ); + (*it).setTempSyncStat( SYNC_TEMPSTATE_NEW_ID ); } ++it; } } deleteRemovedAddressees(); } @@ -937,17 +937,17 @@ void AddressBook::postExternSync( AddressBook* aBook , const QString& csd, bool qDebug("postExternSync:ERROR addressee is empty: %s ", (*it).uid().latin1()); } else { (*it).setIDStr(":"); (*it).computeCsum( csd ); if ( setID ) { if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_ID ) ad.setID( csd, (*it).externalUID() ); } else - ad.setID( csd, "_" ); + ad.setID( csd, (*it).uid() ); ad.setCsum( csd, (*it).getCsum( csd ) ); aBook->insertAddressee( ad ); } } } } bool AddressBook::containsExternalUid( const QString& uid ) |