-rw-r--r-- | kaddressbook/kabcore.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index c1ead9d..c2f031a 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -2769,6 +2769,7 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo | |||
2769 | if ( take == 1 ) {// take local | 2769 | if ( take == 1 ) {// take local |
2770 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 2770 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
2771 | inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) ); | 2771 | inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) ); |
2772 | inL.setID( mCurrentSyncDevice, inR.getID(mCurrentSyncDevice) ); | ||
2772 | local->insertAddressee( inL, false ); | 2773 | local->insertAddressee( inL, false ); |
2773 | idS = inR.externalUID(); | 2774 | idS = inR.externalUID(); |
2774 | OidS = inR.originalExternalUID(); | 2775 | OidS = inR.originalExternalUID(); |
@@ -2796,6 +2797,10 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo | |||
2796 | local->removeAddressee( inL ); | 2797 | local->removeAddressee( inL ); |
2797 | inL = inR; | 2798 | inL = inR; |
2798 | inL.setIDStr( idS ); | 2799 | inL.setIDStr( idS ); |
2800 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | ||
2801 | inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) ); | ||
2802 | inL.setID( mCurrentSyncDevice, inR.getID(mCurrentSyncDevice) ); | ||
2803 | } | ||
2799 | inL.setResource( 0 ); | 2804 | inL.setResource( 0 ); |
2800 | local->insertAddressee( inL , false ); | 2805 | local->insertAddressee( inL , false ); |
2801 | ++changedLocal; | 2806 | ++changedLocal; |