summaryrefslogtreecommitdiffabout
path: root/kaddressbook/kabcore.cpp
authorzautrix <zautrix>2005-04-03 22:00:17 (UTC)
committer zautrix <zautrix>2005-04-03 22:00:17 (UTC)
commit30359da3c126e67f6c75400323fcca4c159c3d93 (patch) (side-by-side diff)
tree71fbc8d5574ebe5156171af935f9c5da99d9ffcf /kaddressbook/kabcore.cpp
parent23d4df2516068bfbf8d968b94763d0a6d6e13271 (diff)
downloadkdepimpi-30359da3c126e67f6c75400323fcca4c159c3d93.zip
kdepimpi-30359da3c126e67f6c75400323fcca4c159c3d93.tar.gz
kdepimpi-30359da3c126e67f6c75400323fcca4c159c3d93.tar.bz2
sync fixes
Diffstat (limited to 'kaddressbook/kabcore.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/kabcore.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index eba74a6..20b107e 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2868,10 +2868,10 @@ int KABCore::takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, i
return 1;
break;
case SYNC_PREF_REMOTE:
- if ( lastSync > remoteMod )
- return 1;
if ( lastSync > localMod )
return 2;
+ if ( lastSync > remoteMod )
+ return 1;
return 2;
break;
case SYNC_PREF_NEWEST:
@@ -2882,6 +2882,8 @@ int KABCore::takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, i
break;
case SYNC_PREF_ASK:
//qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() );
+ if ( lastSync > remoteMod && lastSync > localMod)
+ return 0;
if ( lastSync > remoteMod )
return 1;
if ( lastSync > localMod ) {