-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 | |||
@@ -2552,22 +2552,22 @@ int KABCore::takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, i | |||
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 ); |