| author | zautrix <zautrix> | 2004-09-18 18:46:29 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2004-09-18 18:46:29 (UTC) |
| commit | ec8099bf369e5b8327ca6cfd78b34366353e3abf (patch) (side-by-side diff) | |
| tree | 551c515124f7b1c47b2860803efa3922f494f938 /kaddressbook | |
| parent | 3f16c7aa0ab6badf304c537a6981ece743138821 (diff) | |
| download | kdepimpi-ec8099bf369e5b8327ca6cfd78b34366353e3abf.zip kdepimpi-ec8099bf369e5b8327ca6cfd78b34366353e3abf.tar.gz kdepimpi-ec8099bf369e5b8327ca6cfd78b34366353e3abf.tar.bz2 | |
More AB sync
| -rw-r--r-- | kaddressbook/kabcore.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 74c10d2..b1a951c 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -2652,9 +2652,11 @@ int KABCore::takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, i result = getEventViewerDialog()->executeS( localIsNew ); #endif qDebug("conflict! ************************************** "); - result = 1; + { + KPIM::AddresseeChooser acd ( *local,*remote, localIsNew , this ); + result = acd.executeD(localIsNew); return result; - + } break; case SYNC_PREF_FORCE_LOCAL: return 1; @@ -2725,6 +2727,7 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo qDebug("FULLDATE 3 %s %s", addresseeLSync.revision().toString().latin1() , addresseeRSync.revision().toString().latin1() ); } } + fullDateRange = true; // debug only! if ( fullDateRange ) mLastAddressbookSync = QDateTime::currentDateTime().addDays( -100*365); else |