author | zautrix <zautrix> | 2004-09-21 11:24:59 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-21 11:24:59 (UTC) |
commit | f66482cac98648a1e5ea21fddd55e6916f2a1c60 (patch) (unidiff) | |
tree | c51d30ac1fcb67572654a7a4d2d845b57618f61c /kaddressbook | |
parent | ba89a5d20eb054054d9cfae3723a4d62b9f62efd (diff) | |
download | kdepimpi-f66482cac98648a1e5ea21fddd55e6916f2a1c60.zip kdepimpi-f66482cac98648a1e5ea21fddd55e6916f2a1c60.tar.gz kdepimpi-f66482cac98648a1e5ea21fddd55e6916f2a1c60.tar.bz2 |
latest fixes
-rw-r--r-- | kaddressbook/kabcore.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index c2f031a..4ebd6a8 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -2546,34 +2546,34 @@ int KABCore::takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, i | |||
2546 | // int zaurusStat() const; | 2546 | // int zaurusStat() const; |
2547 | // 0 equal | 2547 | // 0 equal |
2548 | // 1 take local | 2548 | // 1 take local |
2549 | // 2 take remote | 2549 | // 2 take remote |
2550 | // 3 cancel | 2550 | // 3 cancel |
2551 | QDateTime lastSync = mLastAddressbookSync; | 2551 | QDateTime lastSync = mLastAddressbookSync; |
2552 | QDateTime localMod = local->revision(); | 2552 | QDateTime localMod = local->revision(); |
2553 | QDateTime remoteMod = remote->revision(); | 2553 | QDateTime remoteMod = remote->revision(); |
2554 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 2554 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
2555 | bool remCh, locCh; | 2555 | bool remCh, locCh; |
2556 | remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) ); | 2556 | remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) ); |
2557 | 2557 | ||
2558 | qDebug("loc %s rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() ); | 2558 | //qDebug("loc %s rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() ); |
2559 | locCh = ( localMod > mLastAddressbookSync ); | 2559 | locCh = ( localMod > mLastAddressbookSync ); |
2560 | if ( !remCh && ! locCh ) { | 2560 | if ( !remCh && ! locCh ) { |
2561 | qDebug("both not changed "); | 2561 | //qDebug("both not changed "); |
2562 | lastSync = localMod.addDays(1); | 2562 | lastSync = localMod.addDays(1); |
2563 | if ( mode <= SYNC_PREF_ASK ) | 2563 | if ( mode <= SYNC_PREF_ASK ) |
2564 | return 0; | 2564 | return 0; |
2565 | } else { | 2565 | } else { |
2566 | if ( locCh ) { | 2566 | if ( locCh ) { |
2567 | qDebug("loc changed %s %s", localMod.toString().latin1(), mLastAddressbookSync.toString().latin1()); | 2567 | //qDebug("loc changed %s %s", localMod.toString().latin1(), mLastAddressbookSync.toString().latin1()); |
2568 | lastSync = localMod.addDays( -1 ); | 2568 | lastSync = localMod.addDays( -1 ); |
2569 | if ( !remCh ) | 2569 | if ( !remCh ) |
2570 | remoteMod =( lastSync.addDays( -1 ) ); | 2570 | remoteMod =( lastSync.addDays( -1 ) ); |
2571 | } else { | 2571 | } else { |
2572 | //qDebug(" not loc changed "); | 2572 | //qDebug(" not loc changed "); |
2573 | lastSync = localMod.addDays( 1 ); | 2573 | lastSync = localMod.addDays( 1 ); |
2574 | if ( remCh ) | 2574 | if ( remCh ) |
2575 | remoteMod =( lastSync.addDays( 1 ) ); | 2575 | remoteMod =( lastSync.addDays( 1 ) ); |
2576 | 2576 | ||
2577 | } | 2577 | } |
2578 | } | 2578 | } |
2579 | full = true; | 2579 | full = true; |