author | zautrix <zautrix> | 2005-04-03 22:00:17 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-03 22:00:17 (UTC) |
commit | 30359da3c126e67f6c75400323fcca4c159c3d93 (patch) (unidiff) | |
tree | 71fbc8d5574ebe5156171af935f9c5da99d9ffcf /kaddressbook/kabcore.cpp | |
parent | 23d4df2516068bfbf8d968b94763d0a6d6e13271 (diff) | |
download | kdepimpi-30359da3c126e67f6c75400323fcca4c159c3d93.zip kdepimpi-30359da3c126e67f6c75400323fcca4c159c3d93.tar.gz kdepimpi-30359da3c126e67f6c75400323fcca4c159c3d93.tar.bz2 |
sync fixes
-rw-r--r-- | kaddressbook/kabcore.cpp | 6 |
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 | |||
@@ -2869,8 +2869,8 @@ int KABCore::takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, i | |||
2869 | break; | 2869 | break; |
2870 | case SYNC_PREF_REMOTE: | 2870 | case SYNC_PREF_REMOTE: |
2871 | if ( lastSync > remoteMod ) | ||
2872 | return 1; | ||
2873 | if ( lastSync > localMod ) | 2871 | if ( lastSync > localMod ) |
2874 | return 2; | 2872 | return 2; |
2873 | if ( lastSync > remoteMod ) | ||
2874 | return 1; | ||
2875 | return 2; | 2875 | return 2; |
2876 | break; | 2876 | break; |
@@ -2883,4 +2883,6 @@ int KABCore::takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, i | |||
2883 | case SYNC_PREF_ASK: | 2883 | case SYNC_PREF_ASK: |
2884 | //qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() ); | 2884 | //qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() ); |
2885 | if ( lastSync > remoteMod && lastSync > localMod) | ||
2886 | return 0; | ||
2885 | if ( lastSync > remoteMod ) | 2887 | if ( lastSync > remoteMod ) |
2886 | return 1; | 2888 | return 1; |