summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/calendarview.cpp19
1 files changed, 3 insertions, 16 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index ff1db2c..290c0b9 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -716,8 +716,2 @@ int CalendarView::takeEvent( Incidence* local, Incidence* remote, int mode , b
- //void setZaurusId(int id);
- // int zaurusId() const;
- // void setZaurusUid(int id);
- // int zaurusUid() const;
- // void setZaurusStat(int id);
- // int zaurusStat() const;
// 0 equal
@@ -945,3 +939,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int
} else {
- if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
+ if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL || mSyncKDE) {
eventRSync = (Event*)eventLSync->clone();
@@ -975,6 +969,6 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int
mLastCalendarSync = loadedFileVersion;
- qDebug("setting mLastCalendarSync ");
+ //qDebug("setting mLastCalendarSync ");
}
//qDebug("*************************** ");
- qDebug("mLastCalendarSync %s ",mLastCalendarSync.toString().latin1() );
+ qDebug("mLastCalendarSync %s full: %d",mLastCalendarSync.toString().latin1(), fullDateRange);
QPtrList<Incidence> er = remote->rawIncidences();
@@ -1010,5 +1004,2 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int
if ( inL ) { // maybe conflict - same uid in both calendars
- int maxrev = inL->revision();
- if ( maxrev < inR->revision() )
- maxrev = inR->revision();
if ( (take = takeEvent( inL, inR, mode, fullDateRange )) > 0 ) {
@@ -1023,4 +1014,2 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int
remote->deleteIncidence( inR );
- if ( inL->revision() < maxrev )
- inL->setRevision( maxrev );
inR = inL->clone();
@@ -1034,4 +1023,2 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int
} else {
- if ( inR->revision() < maxrev )
- inR->setRevision( maxrev );
idS = inL->IDStr();