| -rw-r--r-- | korganizer/calendarview.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index e45240a..6128137 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -1497,14 +1497,14 @@ int CalendarView::takeEvent( Incidence* local, Incidence* remote, int mode , b return 2; break; case SYNC_PREF_ASK: - qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() ); + //qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() ); if ( lastSync > remoteMod && lastSync > localMod) return 0; if ( lastSync > remoteMod ) return 1; if ( lastSync > localMod ) return 2; - qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() ); + //qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() ); localIsNew = localMod >= remoteMod; if ( localIsNew ) getEventViewerDialog()->setColorMode( 1 ); @@ -1541,8 +1541,10 @@ Event* CalendarView::getLastSyncEvent() { Event* lse; //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() ); + mCalendar->setSyncEventsEnabled(); lse = mCalendar->event( "last-syncEvent-"+mCurrentSyncDevice ); if (!lse) { + qDebug("KO: New last Syncevent created for local: %s",mCurrentSyncDevice.latin1() ); lse = new Event(); lse->setUid( "last-syncEvent-"+mCurrentSyncDevice ); QString sum = ""; @@ -1555,7 +1557,8 @@ Event* CalendarView::getLastSyncEvent() lse->setReadOnly( true ); lse->setCalID( 1 ); mCalendar->addEvent( lse ); - } + } else + qDebug("KO: Last Syncevent on local found"); return lse; @@ -1633,7 +1636,7 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int eventLSync = getLastSyncEvent(); eventR = remote->event("last-syncEvent-"+mCurrentSyncName ); if ( eventR ) { - qDebug("last-syncEvent on remote found "); + qDebug("KO: Last-syncEvent on remote found "); eventRSync = (Event*) eventR->clone(); remote->deleteEvent(eventR ); |