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
@@ -2629,3 +2629,3 @@ int  KABCore::takeAddressee( KABC::Addressee* local,  KABC::Addressee* remote, i
     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() )
@@ -2634,22 +2634,4 @@ int  KABCore::takeAddressee( KABC::Addressee* local,  KABC::Addressee* remote, i
             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! ************************************** ");
         {
@@ -2976,3 +2958,2 @@ bool KABCore::syncAB(QString filename, int mode)
 
-
 void KABCore::confSync()