| -rw-r--r-- | kaddressbook/kabcore.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index ea34be2..47ed858 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -2553,2 +2553,3 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo if ( !inL.isEmpty() ) { // maybe conflict - same uid in both calendars + if ( !inL.resource() || inL.resource()->includeInSync() ) { if ( take = takeAddressee( &inL, &inR, mode, fullDateRange ) ) { @@ -2597,2 +2598,3 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo } + } } else { // no conflict @@ -2647,2 +2649,3 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo inL = local->findByUid( uid ); + if ( !inL.resource() || inL.resource()->includeInSync() ) { inR = remote->findByUid( uid ); @@ -2684,2 +2687,3 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo } + } ++incCounter; |