sync fixes

3 files changed, 13 insertions, 2 deletions

diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index 9b196b5..5774c36 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -871,12 +871,19 @@ void AddressBook::removeSyncAddressees( bool removeDeleted )
             it2 = it;
             //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;
         }
     }
     deleteRemovedAddressees();
 }
 
@@ -914,27 +921,31 @@ void AddressBook::preExternSync( AddressBook* aBook, const QString& csd , bool i
     for ( it = begin(); it != end(); ++it ) {
         (*it).setID( csd, (*it).externalUID() );
         (*it).computeCsum( csd );
     }
     mergeAB( aBook ,csd, isSubset );  
 }
-void AddressBook::postExternSync( AddressBook* aBook , const QString& csd)
+void AddressBook::postExternSync( AddressBook* aBook , const QString& csd, bool setID)
 {
     //qDebug("AddressBook::postExternSync ");
     AddressBook::Iterator it;  
     for ( it = begin(); it != end(); ++it ) {
         // qDebug("check uid %s ", (*it).uid().latin1() );
         if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_ID ||
              (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_CSUM ) {
             Addressee ad = aBook->findByUid( ( (*it).uid() ));
             if ( ad.isEmpty() ) {
                 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.setCsum( csd, (*it).getCsum( csd ) );
                 aBook->insertAddressee( ad );
             }
         }
     }
 }
diff --git a/kabc/addressbook.h b/kabc/addressbook.h
index f124dc9..75f8b51 100644
--- a/kabc/addressbook.h
+++ b/kabc/addressbook.h
@@ -304,13 +304,13 @@ class AddressBook : public QObject
     void removeSyncAddressees( bool removeDeleted = false );
     void  mergeAB( AddressBook *aBook, const QString& profile, bool isSubset );
     Addressee findByExternUid( const QString& uid , const QString& profile  );
     bool   containsExternalUid( const QString& uid  );
 
     void preExternSync( AddressBook* aBook, const QString& csd, bool isSubset );
-    void postExternSync( AddressBook* aBook, const QString& csd  );
+    void postExternSync( AddressBook* aBook, const QString& csd , bool setID );
   signals:
     /**
       Emitted, when the address book has changed on disk.
     */
     void addressBookChanged( AddressBook * );
 
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index a660a9d..d5a110a 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp