summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-09-18 16:32:35 (UTC)
committer zautrix <zautrix>2004-09-18 16:32:35 (UTC)
commita355a58898d0d08d797f872751254cfa958387c1 (patch) (unidiff)
treece338c8cc9785d6351a8a8b66fb8e5c1602ceab0
parentbf18a7b4edb4121fd2ea974ac1ec634167c9b993 (diff)
downloadkdepimpi-a355a58898d0d08d797f872751254cfa958387c1.zip
kdepimpi-a355a58898d0d08d797f872751254cfa958387c1.tar.gz
kdepimpi-a355a58898d0d08d797f872751254cfa958387c1.tar.bz2
time fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/addressbook.cpp9
-rw-r--r--kaddressbook/kabcore.cpp3
2 files changed, 10 insertions, 2 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index 3ec0795..d03dea3 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -451,26 +451,31 @@ void AddressBook::insertAddressee( const Addressee &a, bool setRev )
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 bool changed = false; 453 bool changed = false;
454 Addressee addr = a; 454 Addressee addr = a;
455 if ( addr != (*it) ) 455 if ( addr != (*it) )
456 changed = true; 456 changed = true;
457 457
458 (*it) = a; 458 (*it) = a;
459 if ( (*it).resource() == 0 ) 459 if ( (*it).resource() == 0 )
460 (*it).setResource( standardResource() ); 460 (*it).setResource( standardResource() );
461 461
462 if ( changed ) { 462 if ( changed ) {
463 if ( setRev ) 463 if ( setRev ) {
464 (*it).setRevision( QDateTime::currentDateTime() ); 464 // get rid of micro seconds
465 QDateTime dt = QDateTime::currentDateTime();
466 QTime t = dt.time();
467 dt.setTime( QTime (t.hour (), t.minute (), t.second () ) );
468 (*it).setRevision( dt );
469 }
465 (*it).setChanged( true ); 470 (*it).setChanged( true );
466 } 471 }
467 472
468 return; 473 return;
469 } 474 }
470 } 475 }
471 d->mAddressees.append( a ); 476 d->mAddressees.append( a );
472 Addressee& addr = d->mAddressees.last(); 477 Addressee& addr = d->mAddressees.last();
473 if ( addr.resource() == 0 ) 478 if ( addr.resource() == 0 )
474 addr.setResource( standardResource() ); 479 addr.setResource( standardResource() );
475 480
476 addr.setChanged( true ); 481 addr.setChanged( true );
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 226d5e4..215ce83 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2893,24 +2893,27 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
2893 } 2893 }
2894 } 2894 }
2895 } 2895 }
2896 } 2896 }
2897 ++incCounter; 2897 ++incCounter;
2898 } 2898 }
2899 el.clear(); 2899 el.clear();
2900 2900
2901 2901
2902 2902
2903 bar.hide(); 2903 bar.hide();
2904 mLastAddressbookSync = QDateTime::currentDateTime().addSecs( 1 ); 2904 mLastAddressbookSync = QDateTime::currentDateTime().addSecs( 1 );
2905 // get rid of micro seconds
2906 QTime t = mLastAddressbookSync.time();
2907 mLastAddressbookSync.setTime( QTime (t.hour (), t.minute (), t.second () ) );
2905 addresseeLSync.setRevision( mLastAddressbookSync ); 2908 addresseeLSync.setRevision( mLastAddressbookSync );
2906 addresseeRSync.setRevision( mLastAddressbookSync ); 2909 addresseeRSync.setRevision( mLastAddressbookSync );
2907 addresseeRSync.setGivenName( i18n("Remote from: ")+mCurrentSyncName ) ; 2910 addresseeRSync.setGivenName( i18n("Remote from: ")+mCurrentSyncName ) ;
2908 addresseeLSync.setGivenName(i18n("Local from: ") + mCurrentSyncName ); 2911 addresseeLSync.setGivenName(i18n("Local from: ") + mCurrentSyncName );
2909 if ( mGlobalSyncMode == SYNC_MODE_NORMAL) 2912 if ( mGlobalSyncMode == SYNC_MODE_NORMAL)
2910 remote->insertAddressee( addresseeRSync, false ); 2913 remote->insertAddressee( addresseeRSync, false );
2911 local->insertAddressee( addresseeLSync, false ); 2914 local->insertAddressee( addresseeLSync, false );
2912 QString mes; 2915 QString mes;
2913 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 ); 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 );
2914 if ( KABPrefs::instance()->mShowSyncSummary ) { 2917 if ( KABPrefs::instance()->mShowSyncSummary ) {
2915 KMessageBox::information(this, mes, i18n("KO/Pi Synchronization") ); 2918 KMessageBox::information(this, mes, i18n("KO/Pi Synchronization") );
2916 } 2919 }