summaryrefslogtreecommitdiffabout
path: root/kaddressbook/kabcore.cpp
Side-by-side diff
Diffstat (limited to 'kaddressbook/kabcore.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/kabcore.cpp29
1 files changed, 5 insertions, 24 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index b1a951c..cc8eb52 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2627,35 +2627,17 @@ int KABCore::takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, i
return 2;
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 );
- result = acd.executeD(localIsNew);
- return result;
+ KPIM::AddresseeChooser acd ( *local,*remote, localIsNew , this );
+ result = acd.executeD(localIsNew);
+ return result;
}
break;
case SYNC_PREF_FORCE_LOCAL:
@@ -2974,7 +2956,6 @@ bool KABCore::syncAB(QString filename, int mode)
#endif
}
-
void KABCore::confSync()
{
static KSyncPrefsDialog* sp = 0;