| author | zautrix <zautrix> | 2004-10-13 14:23:28 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2004-10-13 14:23:28 (UTC) |
| commit | 2cfda2af7cba3c9aff2d7722421b5d33b7f56cb6 (patch) (side-by-side diff) | |
| tree | f1e664ddf31aae347b1a119c9111cbd1c931bf89 /kaddressbook | |
| parent | d41893fb0a49fbb080326a4c1fd98e1a032a182a (diff) | |
| download | kdepimpi-2cfda2af7cba3c9aff2d7722421b5d33b7f56cb6.zip kdepimpi-2cfda2af7cba3c9aff2d7722421b5d33b7f56cb6.tar.gz kdepimpi-2cfda2af7cba3c9aff2d7722421b5d33b7f56cb6.tar.bz2 | |
more sync fixes
| -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 @@ -2552,4 +2552,5 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo //inR.setResource( 0 ); if ( !inL.isEmpty() ) { // maybe conflict - same uid in both calendars + if ( !inL.resource() || inL.resource()->includeInSync() ) { if ( take = takeAddressee( &inL, &inR, mode, fullDateRange ) ) { //qDebug("take %d %s ", take, inL.summary().latin1()); @@ -2596,4 +2597,5 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo } } + } } else { // no conflict if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { @@ -2646,4 +2648,5 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo if ( !skipIncidence ) { inL = local->findByUid( uid ); + if ( !inL.resource() || inL.resource()->includeInSync() ) { inR = remote->findByUid( uid ); if ( inR.isEmpty() ) { @@ -2683,4 +2686,5 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo } } + } ++incCounter; } |