| author | zautrix <zautrix> | 2004-10-28 21:22:05 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2004-10-28 21:22:05 (UTC) |
| commit | 1b8d173d880e8f681bca88220bdd806a95d3c2a0 (patch) (side-by-side diff) | |
| tree | b01436fec9a5c50f188657ca33ebb6905a81dbb7 /korganizer | |
| parent | 43f40fe1bbc57d3b57d2a715accb51a7c8e473e1 (diff) | |
| download | kdepimpi-1b8d173d880e8f681bca88220bdd806a95d3c2a0.zip kdepimpi-1b8d173d880e8f681bca88220bdd806a95d3c2a0.tar.gz kdepimpi-1b8d173d880e8f681bca88220bdd806a95d3c2a0.tar.bz2 | |
fixed sync
| -rw-r--r-- | korganizer/calendarview.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 59bf615..59f3b40 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -932,12 +932,12 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int if ( KSyncManager::mRequestedSyncEvent.isValid() ) { mLastCalendarSync = KSyncManager::mRequestedSyncEvent; qDebug("using extern time for calendar sync: %s ", mLastCalendarSync.toString().latin1() ); } else { - qDebug("ERROR: KSyncManager::mRequestedSyncEvent has invalid datatime "); + qDebug("KSyncManager::mRequestedSyncEvent has invalid datatime "); } } - QDateTime modifiedCalendar = mLastCalendarSync;; + QDateTime modifiedCalendar = mLastCalendarSync; eventLSync = getLastSyncEvent(); eventR = remote->event("last-syncEvent-"+mCurrentSyncName ); if ( eventR ) { eventRSync = (Event*) eventR->clone(); @@ -967,9 +967,9 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int fullDateRange = true; } } if ( mSyncManager->syncWithDesktop() ) { - fullDateRange = ( eventLSync->dtStart() == mLastCalendarSync ); + fullDateRange = ( eventLSync->dtStart() <= mLastCalendarSync && eventLSync->dtStart().addSecs(1) >= mLastCalendarSync ); } if ( fullDateRange ) mLastCalendarSync = QDateTime::currentDateTime().addDays( -100*365); else |