From 30359da3c126e67f6c75400323fcca4c159c3d93 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Sun, 03 Apr 2005 22:00:17 +0000
Subject: sync fixes

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

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