| author | zautrix <zautrix> | 2004-10-28 21:22:05 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2004-10-28 21:22:05 (UTC) |
| commit | 1b8d173d880e8f681bca88220bdd806a95d3c2a0 (patch) (unidiff) | |
| 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 | |||
| @@ -933,10 +933,10 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
| 933 | mLastCalendarSync = KSyncManager::mRequestedSyncEvent; | 933 | mLastCalendarSync = KSyncManager::mRequestedSyncEvent; |
| 934 | qDebug("using extern time for calendar sync: %s ", mLastCalendarSync.toString().latin1() ); | 934 | qDebug("using extern time for calendar sync: %s ", mLastCalendarSync.toString().latin1() ); |
| 935 | } else { | 935 | } else { |
| 936 | qDebug("ERROR: KSyncManager::mRequestedSyncEvent has invalid datatime "); | 936 | qDebug("KSyncManager::mRequestedSyncEvent has invalid datatime "); |
| 937 | } | 937 | } |
| 938 | } | 938 | } |
| 939 | QDateTime modifiedCalendar = mLastCalendarSync;; | 939 | QDateTime modifiedCalendar = mLastCalendarSync; |
| 940 | eventLSync = getLastSyncEvent(); | 940 | eventLSync = getLastSyncEvent(); |
| 941 | eventR = remote->event("last-syncEvent-"+mCurrentSyncName ); | 941 | eventR = remote->event("last-syncEvent-"+mCurrentSyncName ); |
| 942 | if ( eventR ) { | 942 | if ( eventR ) { |
| @@ -968,7 +968,7 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
| 968 | } | 968 | } |
| 969 | } | 969 | } |
| 970 | if ( mSyncManager->syncWithDesktop() ) { | 970 | if ( mSyncManager->syncWithDesktop() ) { |
| 971 | fullDateRange = ( eventLSync->dtStart() == mLastCalendarSync ); | 971 | fullDateRange = ( eventLSync->dtStart() <= mLastCalendarSync && eventLSync->dtStart().addSecs(1) >= mLastCalendarSync ); |
| 972 | } | 972 | } |
| 973 | if ( fullDateRange ) | 973 | if ( fullDateRange ) |
| 974 | mLastCalendarSync = QDateTime::currentDateTime().addDays( -100*365); | 974 | mLastCalendarSync = QDateTime::currentDateTime().addDays( -100*365); |