| author | zautrix <zautrix> | 2004-09-18 18:46:29 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2004-09-18 18:46:29 (UTC) |
| commit | ec8099bf369e5b8327ca6cfd78b34366353e3abf (patch) (unidiff) | |
| 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 | |||
| @@ -2653,7 +2653,9 @@ int KABCore::takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, i | |||
| 2653 | #endif | 2653 | #endif |
| 2654 | qDebug("conflict! ************************************** "); | 2654 | qDebug("conflict! ************************************** "); |
| 2655 | result = 1; | 2655 | { |
| 2656 | KPIM::AddresseeChooser acd ( *local,*remote, localIsNew , this ); | ||
| 2657 | result = acd.executeD(localIsNew); | ||
| 2656 | return result; | 2658 | return result; |
| 2657 | 2659 | } | |
| 2658 | break; | 2660 | break; |
| 2659 | case SYNC_PREF_FORCE_LOCAL: | 2661 | case SYNC_PREF_FORCE_LOCAL: |
| @@ -2726,4 +2728,5 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo | |||
| 2726 | } | 2728 | } |
| 2727 | } | 2729 | } |
| 2730 | fullDateRange = true; // debug only! | ||
| 2728 | if ( fullDateRange ) | 2731 | if ( fullDateRange ) |
| 2729 | mLastAddressbookSync = QDateTime::currentDateTime().addDays( -100*365); | 2732 | mLastAddressbookSync = QDateTime::currentDateTime().addDays( -100*365); |