| author | zautrix <zautrix> | 2004-09-19 20:27:44 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2004-09-19 20:27:44 (UTC) |
| commit | 3da2cfeab2edbe64a17251662e56668fe143f7a3 (patch) (unidiff) | |
| tree | 37e8d4445fca84bd4e93af38c96c5c489f9cbca8 /kaddressbook | |
| parent | afa28a62314117555d6b32291188eedd1a576284 (diff) | |
| download | kdepimpi-3da2cfeab2edbe64a17251662e56668fe143f7a3.zip kdepimpi-3da2cfeab2edbe64a17251662e56668fe143f7a3.tar.gz kdepimpi-3da2cfeab2edbe64a17251662e56668fe143f7a3.tar.bz2 | |
more AB sync
| -rw-r--r-- | kaddressbook/kabcore.cpp | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index b3d88de..8f3ca9b 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
| @@ -2930,9 +2930,3 @@ bool KABCore::syncAB(QString filename, int mode) | |||
| 2930 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; | 2930 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; |
| 2931 | AddressBook::Iterator it; | 2931 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice ); |
| 2932 | for ( it = abLocal.begin(); it != abLocal.end(); ++it ) { | ||
| 2933 | (*it).setID( mCurrentSyncDevice, (*it).externalUID() ); | ||
| 2934 | (*it).computeCsum( mCurrentSyncDevice ); | ||
| 2935 | } | ||
| 2936 | abLocal.mergeAB( mAddressBook ,mCurrentSyncDevice ); | ||
| 2937 | |||
| 2938 | } else { | 2932 | } else { |
| @@ -2980,18 +2974,3 @@ bool KABCore::syncAB(QString filename, int mode) | |||
| 2980 | // afterwrite processing | 2974 | // afterwrite processing |
| 2981 | AddressBook::Iterator it; | 2975 | abLocal.postExternSync( mAddressBook,mCurrentSyncDevice ); |
| 2982 | for ( it = abLocal.begin(); it != abLocal.end(); ++it ) { | ||
| 2983 | if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_ID || | ||
| 2984 | (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_CSUM ) { | ||
| 2985 | Addressee ad = mAddressBook->findByUid( ( (*it).uid() )); | ||
| 2986 | if ( ad.isEmpty() ) { | ||
| 2987 | qDebug("ERROR ad empty "); | ||
| 2988 | } else { | ||
| 2989 | (*it).computeCsum( mCurrentSyncDevice ); | ||
| 2990 | if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_ID ) | ||
| 2991 | ad.setID( mCurrentSyncDevice, (*it).externalUID() ); | ||
| 2992 | ad.setCsum( mCurrentSyncDevice, (*it).getCsum( mCurrentSyncDevice ) ); | ||
| 2993 | mAddressBook->insertAddressee( ad ); | ||
| 2994 | } | ||
| 2995 | } | ||
| 2996 | } | ||
| 2997 | } | 2976 | } |