| author | zautrix <zautrix> | 2005-11-26 11:20:22 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2005-11-26 11:20:22 (UTC) |
| commit | 85bd9f05564e566b296c949ce6e214ebdbf573ac (patch) (unidiff) | |
| tree | b00eb9453ea06f2b43fd896a9a4840b7d64af69b /korganizer | |
| parent | 3cd0013c04172b312ee21e80224a3b7734b4d413 (diff) | |
| download | kdepimpi-85bd9f05564e566b296c949ce6e214ebdbf573ac.zip kdepimpi-85bd9f05564e566b296c949ce6e214ebdbf573ac.tar.gz kdepimpi-85bd9f05564e566b296c949ce6e214ebdbf573ac.tar.bz2 | |
sync
| -rw-r--r-- | korganizer/calendarview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 538325e..9571f16 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
| @@ -1718,7 +1718,7 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
| 1718 | QString idS; | 1718 | QString idS; |
| 1719 | qApp->processEvents(); | 1719 | qApp->processEvents(); |
| 1720 | if ( !skipIncidence ) { | 1720 | if ( !skipIncidence ) { |
| 1721 | inL = local->incidenceForUid( uid , false ); | 1721 | inL = local->incidenceForUid( uid , false , true ); |
| 1722 | if ( inL ) { // maybe conflict - same uid in both calendars | 1722 | if ( inL ) { // maybe conflict - same uid in both calendars |
| 1723 | if ( (take = takeEvent( inL, inR, mode, fullDateRange )) > 0 ) { | 1723 | if ( (take = takeEvent( inL, inR, mode, fullDateRange )) > 0 ) { |
| 1724 | //qDebug("take %d %s ", take, inL->summary().latin1()); | 1724 | //qDebug("take %d %s ", take, inL->summary().latin1()); |
| @@ -1828,7 +1828,7 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
| 1828 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL && inL->typeID() == journalID ) | 1828 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL && inL->typeID() == journalID ) |
| 1829 | skipIncidence = true; | 1829 | skipIncidence = true; |
| 1830 | if ( !skipIncidence ) { | 1830 | if ( !skipIncidence ) { |
| 1831 | inR = remote->incidenceForUid( uid , true ); | 1831 | inR = remote->incidenceForUid( uid , true, true ); |
| 1832 | if ( ! inR ) { | 1832 | if ( ! inR ) { |
| 1833 | if ( !filterOUT || filterOUT->filterCalendarItem( inL ) ){ | 1833 | if ( !filterOUT || filterOUT->filterCalendarItem( inL ) ){ |
| 1834 | // no conflict ********** add or delete local | 1834 | // no conflict ********** add or delete local |