From ec8099bf369e5b8327ca6cfd78b34366353e3abf Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Sat, 18 Sep 2004 18:46:29 +0000
Subject: More AB sync

---
(limited to 'kaddressbook/kabcore.cpp')

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
--
cgit v0.9.0.2