-rw-r--r-- | kabc/addressbook.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp index 5774c36..6194d6d 100644 --- a/kabc/addressbook.cpp +++ b/kabc/addressbook.cpp | |||
@@ -868,25 +868,25 @@ void AddressBook::removeSyncAddressees( bool removeDeleted ) | |||
868 | (*it).setIDStr(""); | 868 | (*it).setIDStr(""); |
869 | } | 869 | } |
870 | if ( ( (*it).tempSyncStat() == SYNC_TEMPSTATE_DELETE && removeDeleted )|| (*it).uid().left( 19 ) == QString("last-syncAddressee-")) { | 870 | if ( ( (*it).tempSyncStat() == SYNC_TEMPSTATE_DELETE && removeDeleted )|| (*it).uid().left( 19 ) == QString("last-syncAddressee-")) { |
871 | it2 = it; | 871 | it2 = it; |
872 | //qDebug("removing %s ",(*it).uid().latin1() ); | 872 | //qDebug("removing %s ",(*it).uid().latin1() ); |
873 | ++it; | 873 | ++it; |
874 | removeAddressee( it2 ); | 874 | removeAddressee( it2 ); |
875 | } else { | 875 | } else { |
876 | //qDebug("skipping %s ",(*it).uid().latin1() ); | 876 | //qDebug("skipping %s ",(*it).uid().latin1() ); |
877 | if ( removeDeleted ) { | 877 | if ( removeDeleted ) { |
878 | // we have no postprocessing in the resource, we have to do it here | 878 | // we have no postprocessing in the resource, we have to do it here |
879 | // we have to compute csum for all, because it could be the first sync | 879 | // we have to compute csum for all, because it could be the first sync |
880 | (*it).setTempSyncStat( SYNC_TEMPSTATE_NEW_CSUM ); | 880 | (*it).setTempSyncStat( SYNC_TEMPSTATE_NEW_ID ); |
881 | 881 | ||
882 | 882 | ||
883 | } | 883 | } |
884 | ++it; | 884 | ++it; |
885 | } | 885 | } |
886 | } | 886 | } |
887 | deleteRemovedAddressees(); | 887 | deleteRemovedAddressees(); |
888 | } | 888 | } |
889 | 889 | ||
890 | void AddressBook::removeAddressee( const Iterator &it ) | 890 | void AddressBook::removeAddressee( const Iterator &it ) |
891 | { | 891 | { |
892 | d->mRemovedAddressees.append( (*it) ); | 892 | d->mRemovedAddressees.append( (*it) ); |
@@ -933,25 +933,25 @@ void AddressBook::postExternSync( AddressBook* aBook , const QString& csd, bool | |||
933 | if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_ID || | 933 | if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_ID || |
934 | (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_CSUM ) { | 934 | (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_CSUM ) { |
935 | Addressee ad = aBook->findByUid( ( (*it).uid() )); | 935 | Addressee ad = aBook->findByUid( ( (*it).uid() )); |
936 | if ( ad.isEmpty() ) { | 936 | if ( ad.isEmpty() ) { |
937 | qDebug("postExternSync:ERROR addressee is empty: %s ", (*it).uid().latin1()); | 937 | qDebug("postExternSync:ERROR addressee is empty: %s ", (*it).uid().latin1()); |
938 | } else { | 938 | } else { |
939 | (*it).setIDStr(":"); | 939 | (*it).setIDStr(":"); |
940 | (*it).computeCsum( csd ); | 940 | (*it).computeCsum( csd ); |
941 | if ( setID ) { | 941 | if ( setID ) { |
942 | if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_ID ) | 942 | if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_ID ) |
943 | ad.setID( csd, (*it).externalUID() ); | 943 | ad.setID( csd, (*it).externalUID() ); |
944 | } else | 944 | } else |
945 | ad.setID( csd, "_" ); | 945 | ad.setID( csd, (*it).uid() ); |
946 | ad.setCsum( csd, (*it).getCsum( csd ) ); | 946 | ad.setCsum( csd, (*it).getCsum( csd ) ); |
947 | aBook->insertAddressee( ad ); | 947 | aBook->insertAddressee( ad ); |
948 | } | 948 | } |
949 | } | 949 | } |
950 | } | 950 | } |
951 | } | 951 | } |
952 | 952 | ||
953 | bool AddressBook::containsExternalUid( const QString& uid ) | 953 | bool AddressBook::containsExternalUid( const QString& uid ) |
954 | { | 954 | { |
955 | Iterator it; | 955 | Iterator it; |
956 | for ( it = begin(); it != end(); ++it ) { | 956 | for ( it = begin(); it != end(); ++it ) { |
957 | if ( uid == (*it).externalUID( ) ) | 957 | if ( uid == (*it).externalUID( ) ) |