-rw-r--r-- | kabc/addressbook.cpp | 9 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 20 |
2 files changed, 18 insertions, 11 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp index d03dea3..16e1653 100644 --- a/kabc/addressbook.cpp +++ b/kabc/addressbook.cpp | |||
@@ -450,6 +450,9 @@ void AddressBook::insertAddressee( const Addressee &a, bool setRev ) | |||
450 | Addressee::List::Iterator it; | 450 | Addressee::List::Iterator it; |
451 | for ( it = d->mAddressees.begin(); it != d->mAddressees.end(); ++it ) { | 451 | for ( it = d->mAddressees.begin(); it != d->mAddressees.end(); ++it ) { |
452 | if ( a.uid() == (*it).uid() ) { | 452 | if ( a.uid() == (*it).uid() ) { |
453 | if ( setRev && (*it).uid().left( 19 ) == QString("last-syncAddressee-") ) { | ||
454 | return; | ||
455 | } | ||
453 | bool changed = false; | 456 | bool changed = false; |
454 | Addressee addr = a; | 457 | Addressee addr = a; |
455 | if ( addr != (*it) ) | 458 | if ( addr != (*it) ) |
@@ -461,6 +464,7 @@ void AddressBook::insertAddressee( const Addressee &a, bool setRev ) | |||
461 | 464 | ||
462 | if ( changed ) { | 465 | if ( changed ) { |
463 | if ( setRev ) { | 466 | if ( setRev ) { |
467 | |||
464 | // get rid of micro seconds | 468 | // get rid of micro seconds |
465 | QDateTime dt = QDateTime::currentDateTime(); | 469 | QDateTime dt = QDateTime::currentDateTime(); |
466 | QTime t = dt.time(); | 470 | QTime t = dt.time(); |
@@ -525,7 +529,7 @@ Addressee::List AddressBook::getExternLastSyncAddressees() | |||
525 | 529 | ||
526 | Iterator it; | 530 | Iterator it; |
527 | for ( it = begin(); it != end(); ++it ) { | 531 | for ( it = begin(); it != end(); ++it ) { |
528 | if ( (*it).uid().left( 20 ) == "last-syncAddressee-" ) { | 532 | if ( (*it).uid().left( 19 ) == "last-syncAddressee-" ) { |
529 | if ( (*it).familyName().left(3) == "E: " ) | 533 | if ( (*it).familyName().left(3) == "E: " ) |
530 | results.append( *it ); | 534 | results.append( *it ); |
531 | } | 535 | } |
@@ -555,7 +559,8 @@ QStringList AddressBook:: uidList() | |||
555 | 559 | ||
556 | Addressee::List AddressBook::allAddressees() | 560 | Addressee::List AddressBook::allAddressees() |
557 | { | 561 | { |
558 | return d->mAddressees; | 562 | return d->mAddressees; |
563 | |||
559 | } | 564 | } |
560 | 565 | ||
561 | Addressee::List AddressBook::findByName( const QString &name ) | 566 | Addressee::List AddressBook::findByName( const QString &name ) |
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 215ce83..74c10d2 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -2528,7 +2528,7 @@ KABC::Addressee KABCore::getLastSyncAddressee() | |||
2528 | QString sum = ""; | 2528 | QString sum = ""; |
2529 | if ( KABPrefs::instance()->mExternSyncProfiles.contains( mCurrentSyncDevice ) ) | 2529 | if ( KABPrefs::instance()->mExternSyncProfiles.contains( mCurrentSyncDevice ) ) |
2530 | sum = "E: "; | 2530 | sum = "E: "; |
2531 | lse.setFamilyName(sum+mCurrentSyncDevice + i18n(" - sync event")); | 2531 | lse.setFamilyName("!"+sum+mCurrentSyncDevice + i18n(" - sync event")); |
2532 | lse.setRevision( mLastAddressbookSync ); | 2532 | lse.setRevision( mLastAddressbookSync ); |
2533 | lse.setCategories( i18n("SyncEvent") ); | 2533 | lse.setCategories( i18n("SyncEvent") ); |
2534 | mAddressBook->insertAddressee( lse ); | 2534 | mAddressBook->insertAddressee( lse ); |
@@ -2763,7 +2763,7 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo | |||
2763 | bar.setProgress( incCounter ); | 2763 | bar.setProgress( incCounter ); |
2764 | uid = er[ incCounter ]; | 2764 | uid = er[ incCounter ]; |
2765 | bool skipIncidence = false; | 2765 | bool skipIncidence = false; |
2766 | if ( uid.left(20) == QString("last-syncAddressee-") ) | 2766 | if ( uid.left(19) == QString("last-syncAddressee-") ) |
2767 | skipIncidence = true; | 2767 | skipIncidence = true; |
2768 | QString idS; | 2768 | QString idS; |
2769 | qApp->processEvents(); | 2769 | qApp->processEvents(); |
@@ -2850,7 +2850,7 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo | |||
2850 | bar.setProgress( incCounter ); | 2850 | bar.setProgress( incCounter ); |
2851 | uid = el[ incCounter ]; | 2851 | uid = el[ incCounter ]; |
2852 | bool skipIncidence = false; | 2852 | bool skipIncidence = false; |
2853 | if ( uid.left(20) == QString("last-syncAddressee-") ) | 2853 | if ( uid.left(19) == QString("last-syncAddressee-") ) |
2854 | skipIncidence = true; | 2854 | skipIncidence = true; |
2855 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) | 2855 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) |
2856 | skipIncidence = true; | 2856 | skipIncidence = true; |
@@ -2897,9 +2897,6 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo | |||
2897 | ++incCounter; | 2897 | ++incCounter; |
2898 | } | 2898 | } |
2899 | el.clear(); | 2899 | el.clear(); |
2900 | |||
2901 | |||
2902 | |||
2903 | bar.hide(); | 2900 | bar.hide(); |
2904 | mLastAddressbookSync = QDateTime::currentDateTime().addSecs( 1 ); | 2901 | mLastAddressbookSync = QDateTime::currentDateTime().addSecs( 1 ); |
2905 | // get rid of micro seconds | 2902 | // get rid of micro seconds |
@@ -2907,15 +2904,20 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo | |||
2907 | mLastAddressbookSync.setTime( QTime (t.hour (), t.minute (), t.second () ) ); | 2904 | mLastAddressbookSync.setTime( QTime (t.hour (), t.minute (), t.second () ) ); |
2908 | addresseeLSync.setRevision( mLastAddressbookSync ); | 2905 | addresseeLSync.setRevision( mLastAddressbookSync ); |
2909 | addresseeRSync.setRevision( mLastAddressbookSync ); | 2906 | addresseeRSync.setRevision( mLastAddressbookSync ); |
2910 | addresseeRSync.setGivenName( i18n("Remote from: ")+mCurrentSyncName ) ; | 2907 | addresseeRSync.setRole( i18n("!Remote from: ")+mCurrentSyncName ) ; |
2911 | addresseeLSync.setGivenName(i18n("Local from: ") + mCurrentSyncName ); | 2908 | addresseeLSync.setRole(i18n("!Local from: ") + mCurrentSyncName ); |
2909 | addresseeRSync.setGivenName( i18n("!DO NOT EDIT!") ) ; | ||
2910 | addresseeLSync.setGivenName(i18n("!DO NOT EDIT!") ); | ||
2911 | addresseeRSync.setOrganization( "!"+mLastAddressbookSync.toString() ) ; | ||
2912 | addresseeLSync.setOrganization("!"+ mLastAddressbookSync.toString() ); | ||
2913 | |||
2912 | if ( mGlobalSyncMode == SYNC_MODE_NORMAL) | 2914 | if ( mGlobalSyncMode == SYNC_MODE_NORMAL) |
2913 | remote->insertAddressee( addresseeRSync, false ); | 2915 | remote->insertAddressee( addresseeRSync, false ); |
2914 | local->insertAddressee( addresseeLSync, false ); | 2916 | local->insertAddressee( addresseeLSync, false ); |
2915 | QString mes; | 2917 | QString mes; |
2916 | mes .sprintf( i18n("Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n"),addedAddressee, addedAddresseeR, changedLocal, changedRemote, deletedAddresseeL, deletedAddresseeR ); | 2918 | mes .sprintf( i18n("Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n"),addedAddressee, addedAddresseeR, changedLocal, changedRemote, deletedAddresseeL, deletedAddresseeR ); |
2917 | if ( KABPrefs::instance()->mShowSyncSummary ) { | 2919 | if ( KABPrefs::instance()->mShowSyncSummary ) { |
2918 | KMessageBox::information(this, mes, i18n("KO/Pi Synchronization") ); | 2920 | KMessageBox::information(this, mes, i18n("KA/Pi Synchronization") ); |
2919 | } | 2921 | } |
2920 | qDebug( mes ); | 2922 | qDebug( mes ); |
2921 | return syncOK; | 2923 | return syncOK; |