| author | zautrix <zautrix> | 2005-07-09 12:00:17 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2005-07-09 12:00:17 (UTC) |
| commit | fa0b6f9dae69ae7ac610b2bc97ca79b74d04f5e5 (patch) (unidiff) | |
| tree | b8d4b3cec0f447fb2930fe2ab9cd191bf7e015d0 /korganizer | |
| parent | 2e2d9a949b8273ad52b09ffdf2c9250acfdbe6db (diff) | |
| download | kdepimpi-fa0b6f9dae69ae7ac610b2bc97ca79b74d04f5e5.zip kdepimpi-fa0b6f9dae69ae7ac610b2bc97ca79b74d04f5e5.tar.gz kdepimpi-fa0b6f9dae69ae7ac610b2bc97ca79b74d04f5e5.tar.bz2 | |
fixx
| -rw-r--r-- | korganizer/calendarview.cpp | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index a350c3b..7044e90 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
| @@ -1442,5 +1442,5 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
| 1442 | qApp->processEvents(); | 1442 | qApp->processEvents(); |
| 1443 | if ( !skipIncidence ) { | 1443 | if ( !skipIncidence ) { |
| 1444 | inL = local->incidence( uid ); | 1444 | inL = local->incidenceForUid( uid , false ); |
| 1445 | if ( inL ) { // maybe conflict - same uid in both calendars | 1445 | if ( inL ) { // maybe conflict - same uid in both calendars |
| 1446 | if ( (take = takeEvent( inL, inR, mode, fullDateRange )) > 0 ) { | 1446 | if ( (take = takeEvent( inL, inR, mode, fullDateRange )) > 0 ) { |
| @@ -1465,19 +1465,21 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
| 1465 | ++changedRemote; | 1465 | ++changedRemote; |
| 1466 | } else {// take remote ********************** | 1466 | } else {// take remote ********************** |
| 1467 | idS = inL->IDStr(); | 1467 | if ( !inL->isReadOnly() ) { |
| 1468 | int pid = inL->pilotId(); | 1468 | idS = inL->IDStr(); |
| 1469 | int calID = inL->calID(); | 1469 | int pid = inL->pilotId(); |
| 1470 | local->deleteIncidence( inL ); | 1470 | int calID = inL->calID(); |
| 1471 | inL = inR->clone(); | 1471 | local->deleteIncidence( inL ); |
| 1472 | inL->setCalID( calID ); | 1472 | inL = inR->clone(); |
| 1473 | if ( mSyncManager->syncWithDesktop() ) | 1473 | inL->setCalID( calID ); |
| 1474 | inL->setPilotId( pid ); | 1474 | if ( mSyncManager->syncWithDesktop() ) |
| 1475 | inL->setIDStr( idS ); | 1475 | inL->setPilotId( pid ); |
| 1476 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 1476 | inL->setIDStr( idS ); |
| 1477 | inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) ); | 1477 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
| 1478 | inL->setID( mCurrentSyncDevice, inR->getID(mCurrentSyncDevice) ); | 1478 | inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) ); |
| 1479 | inL->setID( mCurrentSyncDevice, inR->getID(mCurrentSyncDevice) ); | ||
| 1480 | } | ||
| 1481 | local->addIncidence( inL ); | ||
| 1482 | ++changedLocal; | ||
| 1479 | } | 1483 | } |
| 1480 | local->addIncidence( inL ); | ||
| 1481 | ++changedLocal; | ||
| 1482 | } | 1484 | } |
| 1483 | } | 1485 | } |
| @@ -1550,5 +1552,5 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
| 1550 | skipIncidence = true; | 1552 | skipIncidence = true; |
| 1551 | if ( !skipIncidence ) { | 1553 | if ( !skipIncidence ) { |
| 1552 | inR = remote->incidence( uid ); | 1554 | inR = remote->incidenceForUid( uid , true ); |
| 1553 | if ( ! inR ) { | 1555 | if ( ! inR ) { |
| 1554 | if ( !filterOUT || filterOUT->filterCalendarItem( inL ) ){ | 1556 | if ( !filterOUT || filterOUT->filterCalendarItem( inL ) ){ |