1 files changed, 24 insertions, 7 deletions

diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index ec9f893..46a9cf4 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -343,9 +343,14 @@ bool AddressBook::load()
 
   // mark all addressees as unchanged
   Addressee::List::Iterator addrIt;
-  for ( addrIt = d->mAddressees.begin(); addrIt != d->mAddressees.end(); ++addrIt )
+  for ( addrIt = d->mAddressees.begin(); addrIt != d->mAddressees.end(); ++addrIt ) {
     (*addrIt).setChanged( false );
-
+    QString id = (*addrIt).custom( "KADDRESSBOOK", "X-ExternalID" );
+    if ( !id.isEmpty() ) {
+        //qDebug("setId aa %s ", id.latin1());
+        (*addrIt).setIDStr(id );
+    }
+  }
   blockLSEchange = true;
   return ok;
 }
@@ -366,7 +371,12 @@ bool AddressBook::saveAB()
   bool ok = true;
 
   deleteRemovedAddressees();
-
+  Iterator ait;
+  for ( ait = begin(); ait != end(); ++ait ) {
+      if ( !(*ait).IDStr().isEmpty() ) {
+          (*ait).insertCustom( "KADDRESSBOOK", "X-ExternalID", (*ait).IDStr() );
+    }
+  }
   KRES::Manager<Resource>::ActiveIterator it;
   KRES::Manager<Resource> *manager = d->mManager;
   for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) {
@@ -450,8 +460,10 @@ Ticket *AddressBook::requestSaveTicket( Resource *resource )
 void AddressBook::insertAddressee( const Addressee &a, bool setRev )
 {
     if ( blockLSEchange && setRev && a.uid().left( 19 ) == QString("last-syncAddressee-") ) {
+        //qDebug("block insert ");
         return;
     }
+    //qDebug("inserting.... %s ",a.uid().latin1() );
     bool found = false;
     Addressee::List::Iterator it;
     for ( it = d->mAddressees.begin(); it != d->mAddressees.end(); ++it ) {
@@ -480,7 +492,7 @@ void AddressBook::insertAddressee( const Addressee &a, bool setRev )
 
             found = true;
         } else {
-            if ( (*it).uid() == QString("last-syncAddressee-") ) {
+            if ( (*it).uid().left( 19 ) == QString("last-syncAddressee-") ) {
                 QString name = (*it).uid().mid( 19 );
                 Addressee b = a;
                 QString id = b.getID( name );
@@ -516,7 +528,7 @@ void AddressBook::removeAddressee( const Addressee &a )
         found = true;
         it2 = it;
     } else {
-        if ( (*it).uid() == QString("last-syncAddressee-") ) {
+        if ( (*it).uid().left( 19 ) == QString("last-syncAddressee-") ) {
             QString name = (*it).uid().mid( 19 );
             Addressee b = a;
             QString id = b.getID( name );
@@ -545,13 +557,18 @@ void AddressBook::removeDeletedAddressees()
     QDateTime dt ( QDate( 2004,1,1) );
     while ( it != end() ) {
         (*it).setRevision( dt );
-        if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_DELETE ) {
+        (*it).removeCustom( "KADDRESSBOOK", "X-ExternalID" );
+        (*it).setIDStr("");
+        if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_DELETE || (*it).uid().left( 19 ) == QString("last-syncAddressee-")) {
             it2 = it;
+            //qDebug("removing %s ",(*it).uid().latin1() );
             ++it;
             removeAddressee( it2 );
-        } else
+        } else {
+            //qDebug("skipping %s ",(*it).uid().latin1() );
             ++it;
     }
+    }
     deleteRemovedAddressees();
 }