dtm sync fixes

1 files changed, 9 insertions, 5 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index bdc5bd8..c75b4bc 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2636,7 +2636,7 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
                         //qDebug("take %d %s ", take, inL.summary().latin1());
                         if ( take == 3 )
                             return false;
-                        if ( take == 1  ) {// take local
+                        if ( take == 1  ) {// take local **********************
                             if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                                 inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) );
                                 inL.setID( mCurrentSyncDevice, inR.getID(mCurrentSyncDevice) );
@@ -2661,7 +2661,7 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
                             inR.setResource( 0 );
                             remote->insertAddressee(  inR , false);
                             ++changedRemote;
-                        } else { // take == 2  take remote
+                        } else { // take == 2  take remote **********************
                             if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                                 if ( inR.revision().date().year() < 2004 )
                                     inR.setRevision( modifiedCalendar );
@@ -2680,7 +2680,7 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
                         }
                     }
                 }
-            } else { //  no conflict
+            } else { //  no conflict ********** add or delete remote 
                 if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                     QString des = addresseeLSync.note(); 
                     if ( des.find( inR.getID(mCurrentSyncDevice)  +"," ) >= 0 && mode != 5) { // delete it
@@ -2690,7 +2690,10 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
                     } else {
                         inR.setRevision( modifiedCalendar );
                         remote->insertAddressee( inR, false );
-                        inL = inR;
+                        inL = inR; 
+                        inL.setIDStr( ":" );
+                        inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) );
+                        inL.setID( mCurrentSyncDevice, inR.getID(mCurrentSyncDevice) );
                         inL.setResource( 0 );
                         local->insertAddressee( inL , false);
                         ++addedAddressee;
@@ -2732,7 +2735,7 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
             inL = local->findByUid( uid );
             if ( !inL.resource() || inL.resource()->includeInSync() ) {
                 inR = remote->findByUid( uid );
-                if ( inR.isEmpty() ) { 
+                if ( inR.isEmpty() ) { /  no conflict ********** add or delete local
                     if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                         if ( !inL.getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) {
                             // pending checkExternSyncAddressee(addresseeLSyncSharp, inL);
@@ -2761,6 +2764,7 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
                                 inL.setRevision( modifiedCalendar );
                                 local->insertAddressee( inL, false );
                                 inR = inL;
+                                inR.setIDStr( ":" );
                                 inR.setResource( 0 );
                                 remote->insertAddressee( inR, false );
                             }