author | zautrix <zautrix> | 2004-10-13 14:23:28 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-13 14:23:28 (UTC) |
commit | 2cfda2af7cba3c9aff2d7722421b5d33b7f56cb6 (patch) (unidiff) | |
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 | |||
@@ -2551,6 +2551,7 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo | |||
2551 | //inL.setResource( 0 ); | 2551 | //inL.setResource( 0 ); |
2552 | //inR.setResource( 0 ); | 2552 | //inR.setResource( 0 ); |
2553 | if ( !inL.isEmpty() ) { // maybe conflict - same uid in both calendars | 2553 | if ( !inL.isEmpty() ) { // maybe conflict - same uid in both calendars |
2554 | if ( !inL.resource() || inL.resource()->includeInSync() ) { | ||
2554 | if ( take = takeAddressee( &inL, &inR, mode, fullDateRange ) ) { | 2555 | if ( take = takeAddressee( &inL, &inR, mode, fullDateRange ) ) { |
2555 | //qDebug("take %d %s ", take, inL.summary().latin1()); | 2556 | //qDebug("take %d %s ", take, inL.summary().latin1()); |
2556 | if ( take == 3 ) | 2557 | if ( take == 3 ) |
@@ -2595,6 +2596,7 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo | |||
2595 | ++changedLocal; | 2596 | ++changedLocal; |
2596 | } | 2597 | } |
2597 | } | 2598 | } |
2599 | } | ||
2598 | } else { // no conflict | 2600 | } else { // no conflict |
2599 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 2601 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
2600 | QString des = addresseeLSync.note(); | 2602 | QString des = addresseeLSync.note(); |
@@ -2645,6 +2647,7 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo | |||
2645 | skipIncidence = true; | 2647 | skipIncidence = true; |
2646 | if ( !skipIncidence ) { | 2648 | if ( !skipIncidence ) { |
2647 | inL = local->findByUid( uid ); | 2649 | inL = local->findByUid( uid ); |
2650 | if ( !inL.resource() || inL.resource()->includeInSync() ) { | ||
2648 | inR = remote->findByUid( uid ); | 2651 | inR = remote->findByUid( uid ); |
2649 | if ( inR.isEmpty() ) { | 2652 | if ( inR.isEmpty() ) { |
2650 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 2653 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
@@ -2682,6 +2685,7 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo | |||
2682 | } | 2685 | } |
2683 | } | 2686 | } |
2684 | } | 2687 | } |
2688 | } | ||
2685 | ++incCounter; | 2689 | ++incCounter; |
2686 | } | 2690 | } |
2687 | el.clear(); | 2691 | el.clear(); |