summaryrefslogtreecommitdiffabout
path: root/korganizer
Unidiff
Diffstat (limited to 'korganizer') (more/less context) (show whitespace changes)
-rw-r--r--korganizer/calendarview.cpp11
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
@@ -1498,5 +1498,5 @@ int CalendarView::takeEvent( Incidence* local, Incidence* remote, int mode , b
1498 break; 1498 break;
1499 case SYNC_PREF_ASK: 1499 case SYNC_PREF_ASK:
1500 qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() ); 1500 //qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() );
1501 if ( lastSync > remoteMod && lastSync > localMod) 1501 if ( lastSync > remoteMod && lastSync > localMod)
1502 return 0; 1502 return 0;
@@ -1505,5 +1505,5 @@ int CalendarView::takeEvent( Incidence* local, Incidence* remote, int mode , b
1505 if ( lastSync > localMod ) 1505 if ( lastSync > localMod )
1506 return 2; 1506 return 2;
1507 qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() ); 1507 //qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() );
1508 localIsNew = localMod >= remoteMod; 1508 localIsNew = localMod >= remoteMod;
1509 if ( localIsNew ) 1509 if ( localIsNew )
@@ -1542,6 +1542,8 @@ Event* CalendarView::getLastSyncEvent()
1542 Event* lse; 1542 Event* lse;
1543 //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() ); 1543 //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() );
1544 mCalendar->setSyncEventsEnabled();
1544 lse = mCalendar->event( "last-syncEvent-"+mCurrentSyncDevice ); 1545 lse = mCalendar->event( "last-syncEvent-"+mCurrentSyncDevice );
1545 if (!lse) { 1546 if (!lse) {
1547 qDebug("KO: New last Syncevent created for local: %s",mCurrentSyncDevice.latin1() );
1546 lse = new Event(); 1548 lse = new Event();
1547 lse->setUid( "last-syncEvent-"+mCurrentSyncDevice ); 1549 lse->setUid( "last-syncEvent-"+mCurrentSyncDevice );
@@ -1556,5 +1558,6 @@ Event* CalendarView::getLastSyncEvent()
1556 lse->setCalID( 1 ); 1558 lse->setCalID( 1 );
1557 mCalendar->addEvent( lse ); 1559 mCalendar->addEvent( lse );
1558 } 1560 } else
1561 qDebug("KO: Last Syncevent on local found");
1559 1562
1560 return lse; 1563 return lse;
@@ -1634,5 +1637,5 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int
1634 eventR = remote->event("last-syncEvent-"+mCurrentSyncName ); 1637 eventR = remote->event("last-syncEvent-"+mCurrentSyncName );
1635 if ( eventR ) { 1638 if ( eventR ) {
1636 qDebug("last-syncEvent on remote found "); 1639 qDebug("KO: Last-syncEvent on remote found ");
1637 eventRSync = (Event*) eventR->clone(); 1640 eventRSync = (Event*) eventR->clone();
1638 remote->deleteEvent(eventR ); 1641 remote->deleteEvent(eventR );