author | zautrix <zautrix> | 2005-11-25 22:16:50 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-11-25 22:16:50 (UTC) |
commit | b71ee5442df23bb9900d3db6e6244773ee34ef13 (patch) (unidiff) | |
tree | 221ac1af78b4fcbf741a48687f28570216f89049 /korganizer/calendarview.cpp | |
parent | 81d012860ea3d5d17d0e9cf16ec992baa83efbbf (diff) | |
download | kdepimpi-b71ee5442df23bb9900d3db6e6244773ee34ef13.zip kdepimpi-b71ee5442df23bb9900d3db6e6244773ee34ef13.tar.gz kdepimpi-b71ee5442df23bb9900d3db6e6244773ee34ef13.tar.bz2 |
sync
-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 | |||
1497 | return 2; | 1497 | return 2; |
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; |
1503 | if ( lastSync > remoteMod ) | 1503 | if ( lastSync > remoteMod ) |
1504 | return 1; | 1504 | return 1; |
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 ) |
1510 | getEventViewerDialog()->setColorMode( 1 ); | 1510 | getEventViewerDialog()->setColorMode( 1 ); |
@@ -1541,8 +1541,10 @@ Event* CalendarView::getLastSyncEvent() | |||
1541 | { | 1541 | { |
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 ); |
1548 | QString sum = ""; | 1550 | QString sum = ""; |
@@ -1555,7 +1557,8 @@ Event* CalendarView::getLastSyncEvent() | |||
1555 | lse->setReadOnly( true ); | 1557 | lse->setReadOnly( true ); |
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; |
1561 | 1564 | ||
@@ -1633,7 +1636,7 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1633 | eventLSync = getLastSyncEvent(); | 1636 | eventLSync = getLastSyncEvent(); |
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 ); |
1639 | 1642 | ||