author | zautrix <zautrix> | 2004-09-14 03:13:52 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-14 03:13:52 (UTC) |
commit | f1f43030eefa765950cb501aece6cc71fb4e9859 (patch) (side-by-side diff) | |
tree | d7396ac13ab052ee38e2e8e139854cc88a289a43 /korganizer | |
parent | 5060b0737c0c279859cac3bcfb73d2ac21c6a79e (diff) | |
download | kdepimpi-f1f43030eefa765950cb501aece6cc71fb4e9859.zip kdepimpi-f1f43030eefa765950cb501aece6cc71fb4e9859.tar.gz kdepimpi-f1f43030eefa765950cb501aece6cc71fb4e9859.tar.bz2 |
More fixes
-rw-r--r-- | korganizer/calendarview.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 5a6d615..369c7a0 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -726,22 +726,21 @@ int CalendarView::takeEvent( Incidence* local, Incidence* remote, int mode , b // 2 take remote // 3 cancel QDateTime lastSync = mLastCalendarSync; if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { bool remCh, locCh; remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) ); - if ( remCh ) - qDebug("loc %s rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() ); + //if ( remCh ) + //qDebug("loc %s rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() ); locCh = ( local->lastModified() > mLastCalendarSync ); - //qDebug("locCh %d remCh %d locuid %d remuid %d", locCh, remCh,local->zaurusUid(), remote->zaurusUid() ); if ( !remCh && ! locCh ) { //qDebug("both not changed "); lastSync = local->lastModified().addDays(1); } else { if ( locCh ) { - // qDebug("loc changed %d %s %s", local->revision() , local->lastModified().toString().latin1(), mLastCalendarSync.toString().latin1()); + //qDebug("loc changed %d %s %s", local->revision() , local->lastModified().toString().latin1(), mLastCalendarSync.toString().latin1()); lastSync = local->lastModified().addDays( -1 ); if ( !remCh ) remote->setLastModified( lastSync.addDays( -1 ) ); } else { //qDebug(" not loc changed "); lastSync = local->lastModified().addDays( 1 ); @@ -1112,13 +1111,13 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int local->deleteIncidence( inL ); ++deletedEventL; } else { if ( ! KOPrefs::instance()->mWriteBackExistingOnly ) { inL->removeID(mCurrentSyncDevice ); ++addedEventR; - qDebug("remote added Incidence %s ", inL->summary().latin1()); + //qDebug("remote added Incidence %s ", inL->summary().latin1()); inL->setLastModified( modifiedCalendar ); inR = inL->clone(); inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); remote->addIncidence( inR ); } } |