| author | zautrix <zautrix> | 2004-09-18 19:07:00 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2004-09-18 19:07:00 (UTC) |
| commit | 28f894fd2a0dfbd5f09f9e530f359981efe0198c (patch) (side-by-side diff) | |
| tree | 426565d2716916f48b0c3e68b41e963fd10a3463 /kaddressbook | |
| parent | ec8099bf369e5b8327ca6cfd78b34366353e3abf (diff) | |
| download | kdepimpi-28f894fd2a0dfbd5f09f9e530f359981efe0198c.zip kdepimpi-28f894fd2a0dfbd5f09f9e530f359981efe0198c.tar.gz kdepimpi-28f894fd2a0dfbd5f09f9e530f359981efe0198c.tar.bz2 | |
more AB sync
| -rw-r--r-- | kaddressbook/kabcore.cpp | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index b1a951c..cc8eb52 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -2628,29 +2628,11 @@ int KABCore::takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, i break; case SYNC_PREF_ASK: - qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), local->revision().toString().latin1(), remote->revision().toString().latin1() ); + //qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), local->revision().toString().latin1(), remote->revision().toString().latin1() ); if ( lastSync > remote->revision() ) return 1; if ( lastSync > local->revision() ) return 2; - //qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), local->revision().toString().latin1(), remote->revision().toString().latin1() ); localIsNew = local->revision() >= remote->revision(); -#if 0 - if ( localIsNew ) - getEventViewerDialog()->setColorMode( 1 ); - else - getEventViewerDialog()->setColorMode( 2 ); - getEventViewerDialog()->setIncidence(local); - if ( localIsNew ) - getEventViewerDialog()->setColorMode( 2 ); - else - getEventViewerDialog()->setColorMode( 1 ); - getEventViewerDialog()->addIncidence(remote); - getEventViewerDialog()->setColorMode( 0 ); - //qDebug("local %d remote %d ",local->relatedTo(),remote->relatedTo() ); - getEventViewerDialog()->setCaption( mCurrentSyncDevice +i18n(" : Conflict! Please choose entry!")); - getEventViewerDialog()->showMe(); - result = getEventViewerDialog()->executeS( localIsNew ); -#endif - qDebug("conflict! ************************************** "); + //qDebug("conflict! ************************************** "); { KPIM::AddresseeChooser acd ( *local,*remote, localIsNew , this ); @@ -2975,5 +2957,4 @@ bool KABCore::syncAB(QString filename, int mode) } - void KABCore::confSync() { |