summaryrefslogtreecommitdiffabout
path: root/kaddressbook
Unidiff
Diffstat (limited to 'kaddressbook') (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/kabcore.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index ea103a9..273d435 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2776,32 +2776,33 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
2776 addresseeRSync.setRevision( mLastAddressbookSync ); 2776 addresseeRSync.setRevision( mLastAddressbookSync );
2777 addresseeRSync.setRole( i18n("!Remote from: ")+mCurrentSyncName ) ; 2777 addresseeRSync.setRole( i18n("!Remote from: ")+mCurrentSyncName ) ;
2778 addresseeLSync.setRole(i18n("!Local from: ") + mCurrentSyncName ); 2778 addresseeLSync.setRole(i18n("!Local from: ") + mCurrentSyncName );
2779 addresseeRSync.setGivenName( i18n("!DO NOT EDIT!") ) ; 2779 addresseeRSync.setGivenName( i18n("!DO NOT EDIT!") ) ;
2780 addresseeLSync.setGivenName(i18n("!DO NOT EDIT!") ); 2780 addresseeLSync.setGivenName(i18n("!DO NOT EDIT!") );
2781 addresseeRSync.setOrganization( "!"+mLastAddressbookSync.toString() ) ; 2781 addresseeRSync.setOrganization( "!"+mLastAddressbookSync.toString() ) ;
2782 addresseeLSync.setOrganization("!"+ mLastAddressbookSync.toString() ); 2782 addresseeLSync.setOrganization("!"+ mLastAddressbookSync.toString() );
2783 addresseeRSync.setNote( "" ) ; 2783 addresseeRSync.setNote( "" ) ;
2784 addresseeLSync.setNote( "" ); 2784 addresseeLSync.setNote( "" );
2785 2785
2786 if ( mGlobalSyncMode == SYNC_MODE_NORMAL) 2786 if ( mGlobalSyncMode == SYNC_MODE_NORMAL)
2787 remote->insertAddressee( addresseeRSync, false ); 2787 remote->insertAddressee( addresseeRSync, false );
2788 local->insertAddressee( addresseeLSync, false ); 2788 local->insertAddressee( addresseeLSync, false );
2789 QString mes; 2789 QString mes;
2790 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 ); 2790 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 );
2791 qDebug( mes ); 2791 qDebug( mes );
2792 mes = i18n("Local addressbook changed!\n") +mes;
2792 if ( syncManager->mShowSyncSummary ) { 2793 if ( syncManager->mShowSyncSummary ) {
2793 if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, mes, 2794 if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, mes,
2794 i18n("KA/Pi Synchronization"),i18n("Write back"))) { 2795 i18n("KA/Pi Synchronization"),i18n("Write back"))) {
2795 qDebug("cancelled "); 2796 qDebug("cancelled ");
2796 return false; 2797 return false;
2797 } 2798 }
2798 } 2799 }
2799 return syncOK; 2800 return syncOK;
2800} 2801}
2801 2802
2802 2803
2803//this is a overwritten callbackmethods from the syncinterface 2804//this is a overwritten callbackmethods from the syncinterface
2804bool KABCore::sync(KSyncManager* manager, QString filename, int mode) 2805bool KABCore::sync(KSyncManager* manager, QString filename, int mode)
2805{ 2806{
2806 2807
2807 //pending prepare addresseeview for output 2808 //pending prepare addresseeview for output