author | zautrix <zautrix> | 2004-09-21 11:17:18 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-21 11:17:18 (UTC) |
commit | ba89a5d20eb054054d9cfae3723a4d62b9f62efd (patch) (side-by-side diff) | |
tree | ee1a42079e3204dbab6f45762f83cb4c1712579e /kabc/addressee.cpp | |
parent | 19f445f0b6e7d4591db46b89e877ed9f4332ecd4 (diff) | |
download | kdepimpi-ba89a5d20eb054054d9cfae3723a4d62b9f62efd.zip kdepimpi-ba89a5d20eb054054d9cfae3723a4d62b9f62efd.tar.gz kdepimpi-ba89a5d20eb054054d9cfae3723a4d62b9f62efd.tar.bz2 |
DTM fix
-rw-r--r-- | kabc/addressee.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp index 31ce1d6..25c77f6 100644 --- a/kabc/addressee.cpp +++ b/kabc/addressee.cpp @@ -299,32 +299,33 @@ void Addressee::mergeContact( const Addressee& ad ) if ( mData->organization.isEmpty() ) mData->organization = ad.mData->organization ; if ( mData->note.isEmpty() ) mData->note = ad.mData->note ; if ( mData->productId.isEmpty() ) mData->productId = ad.mData->productId; if ( mData->sortString.isEmpty() ) mData->sortString = ad.mData->sortString; if ( !mData->secrecy.isValid() ) mData->secrecy = ad.mData->secrecy; if ( ( !mData->url.isValid() && ad.mData->url.isValid() ) ) mData->url = ad.mData->url ; // pending: // merging phonenumbers // merging addresses // merging emails; // merging categories; // merging custom; // merging keys qDebug("merge contact %s ", ad.uid().latin1()); setUid( ad.uid() ); + setRevision( ad.revision() ); } void Addressee::removeID(const QString &prof) { detach(); mData->mExternalId = KIdManager::removeId ( mData->mExternalId, prof); } void Addressee::setID( const QString & prof , const QString & id ) { detach(); mData->mExternalId = KIdManager::setId ( mData->mExternalId, prof, id ); //qDebug("setID2 %s %s %s",mData->mExternalId.latin1(), prof.latin1(), id.latin1() ); } void Addressee::setTempSyncStat( int id ) { |