-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 ) | |||
299 | if ( mData->organization.isEmpty() ) mData->organization = ad.mData->organization ; | 299 | if ( mData->organization.isEmpty() ) mData->organization = ad.mData->organization ; |
300 | if ( mData->note.isEmpty() ) mData->note = ad.mData->note ; | 300 | if ( mData->note.isEmpty() ) mData->note = ad.mData->note ; |
301 | if ( mData->productId.isEmpty() ) mData->productId = ad.mData->productId; | 301 | if ( mData->productId.isEmpty() ) mData->productId = ad.mData->productId; |
302 | if ( mData->sortString.isEmpty() ) mData->sortString = ad.mData->sortString; | 302 | if ( mData->sortString.isEmpty() ) mData->sortString = ad.mData->sortString; |
303 | if ( !mData->secrecy.isValid() ) mData->secrecy = ad.mData->secrecy; | 303 | if ( !mData->secrecy.isValid() ) mData->secrecy = ad.mData->secrecy; |
304 | if ( ( !mData->url.isValid() && ad.mData->url.isValid() ) ) mData->url = ad.mData->url ; | 304 | if ( ( !mData->url.isValid() && ad.mData->url.isValid() ) ) mData->url = ad.mData->url ; |
305 | 305 | ||
306 | // pending: | 306 | // pending: |
307 | // merging phonenumbers | 307 | // merging phonenumbers |
308 | // merging addresses | 308 | // merging addresses |
309 | // merging emails; | 309 | // merging emails; |
310 | // merging categories; | 310 | // merging categories; |
311 | // merging custom; | 311 | // merging custom; |
312 | // merging keys | 312 | // merging keys |
313 | qDebug("merge contact %s ", ad.uid().latin1()); | 313 | qDebug("merge contact %s ", ad.uid().latin1()); |
314 | setUid( ad.uid() ); | 314 | setUid( ad.uid() ); |
315 | setRevision( ad.revision() ); | ||
315 | } | 316 | } |
316 | 317 | ||
317 | void Addressee::removeID(const QString &prof) | 318 | void Addressee::removeID(const QString &prof) |
318 | { | 319 | { |
319 | detach(); | 320 | detach(); |
320 | mData->mExternalId = KIdManager::removeId ( mData->mExternalId, prof); | 321 | mData->mExternalId = KIdManager::removeId ( mData->mExternalId, prof); |
321 | 322 | ||
322 | } | 323 | } |
323 | void Addressee::setID( const QString & prof , const QString & id ) | 324 | void Addressee::setID( const QString & prof , const QString & id ) |
324 | { | 325 | { |
325 | detach(); | 326 | detach(); |
326 | mData->mExternalId = KIdManager::setId ( mData->mExternalId, prof, id ); | 327 | mData->mExternalId = KIdManager::setId ( mData->mExternalId, prof, id ); |
327 | //qDebug("setID2 %s %s %s",mData->mExternalId.latin1(), prof.latin1(), id.latin1() ); | 328 | //qDebug("setID2 %s %s %s",mData->mExternalId.latin1(), prof.latin1(), id.latin1() ); |
328 | } | 329 | } |
329 | void Addressee::setTempSyncStat( int id ) | 330 | void Addressee::setTempSyncStat( int id ) |
330 | { | 331 | { |