sync fixes

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
@@ -2870,6 +2870,6 @@ int  KABCore::takeAddressee( KABC::Addressee* local,  KABC::Addressee* remote, i
     case SYNC_PREF_REMOTE:
-        if ( lastSync > remoteMod )
-            return 1;
         if ( lastSync > localMod )
             return 2;
+        if ( lastSync > remoteMod )
+            return 1;
         return 2;
@@ -2884,2 +2884,4 @@ int  KABCore::takeAddressee( KABC::Addressee* local,  KABC::Addressee* remote, i
         //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 )