-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 fd68dc4..b543eca 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -992,25 +992,25 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
992 | local->deleteIncidence( inL ); | 992 | local->deleteIncidence( inL ); |
993 | local->addIncidence( inR->clone() ); | 993 | local->addIncidence( inR->clone() ); |
994 | ++changedLocal; | 994 | ++changedLocal; |
995 | } | 995 | } |
996 | } | 996 | } |
997 | } else { // no conflict | 997 | } else { // no conflict |
998 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 998 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
999 | QString des = eventLSync->description(); | 999 | QString des = eventLSync->description(); |
1000 | QString pref = "e"; | 1000 | QString pref = "e"; |
1001 | if ( inR->type() == "Todo" ) | 1001 | if ( inR->type() == "Todo" ) |
1002 | pref = "t"; | 1002 | pref = "t"; |
1003 | if ( des.find(pref+QString::number( inR->zaurusId() ) +"," ) >= 0 && mode != 5) { // delete it | 1003 | if ( des.find(pref+QString::number( inR->zaurusId() ) +"," ) >= 0 && mode != 5) { // delete it |
1004 | inR->setZaurusStat( SYNC_TEMPSTATE_DELETE ); | 1004 | inR->setTempSyncStat( SYNC_TEMPSTATE_DELETE ); |
1005 | //remote->deleteIncidence( inR ); | 1005 | //remote->deleteIncidence( inR ); |
1006 | ++deletedEventR; | 1006 | ++deletedEventR; |
1007 | } else { | 1007 | } else { |
1008 | inR->setLastModified( modifiedCalendar ); | 1008 | inR->setLastModified( modifiedCalendar ); |
1009 | local->addIncidence( inR->clone() ); | 1009 | local->addIncidence( inR->clone() ); |
1010 | ++addedEvent; | 1010 | ++addedEvent; |
1011 | } | 1011 | } |
1012 | } else { | 1012 | } else { |
1013 | if ( inR->lastModified() > mLastCalendarSync || mode == 5 ) { | 1013 | if ( inR->lastModified() > mLastCalendarSync || mode == 5 ) { |
1014 | inR->setLastModified( modifiedCalendar ); | 1014 | inR->setLastModified( modifiedCalendar ); |
1015 | local->addIncidence( inR->clone() ); | 1015 | local->addIncidence( inR->clone() ); |
1016 | ++addedEvent; | 1016 | ++addedEvent; |
@@ -1162,25 +1162,25 @@ void CalendarView::syncSharp() | |||
1162 | /* obsolete | 1162 | /* obsolete |
1163 | while ( inc ) { | 1163 | while ( inc ) { |
1164 | inc->setZaurusStat( inc->revision () ); | 1164 | inc->setZaurusStat( inc->revision () ); |
1165 | inc = iL.next(); | 1165 | inc = iL.next(); |
1166 | } | 1166 | } |
1167 | */ | 1167 | */ |
1168 | // pending: clean last sync event description | 1168 | // pending: clean last sync event description |
1169 | sharpFormat.save(calendar); | 1169 | sharpFormat.save(calendar); |
1170 | iL = calendar->rawIncidences(); | 1170 | iL = calendar->rawIncidences(); |
1171 | inc = iL.first(); | 1171 | inc = iL.first(); |
1172 | Incidence* loc; | 1172 | Incidence* loc; |
1173 | while ( inc ) { | 1173 | while ( inc ) { |
1174 | if ( inc->zaurusStat() == SYNC_TEMPSTATE_NEW_ID ) { | 1174 | if ( inc->tempSyncStat() == SYNC_TEMPSTATE_NEW_ID ) { |
1175 | loc = mCalendar->incidence(inc->uid() ); | 1175 | loc = mCalendar->incidence(inc->uid() ); |
1176 | if ( loc ) { | 1176 | if ( loc ) { |
1177 | loc->setZaurusId( inc->zaurusId() ); | 1177 | loc->setZaurusId( inc->zaurusId() ); |
1178 | loc->setZaurusUid( inc->zaurusUid() ); | 1178 | loc->setZaurusUid( inc->zaurusUid() ); |
1179 | } | 1179 | } |
1180 | } | 1180 | } |
1181 | inc = iL.next(); | 1181 | inc = iL.next(); |
1182 | } | 1182 | } |
1183 | Incidence* lse = getLastSyncEvent(); | 1183 | Incidence* lse = getLastSyncEvent(); |
1184 | if ( lse ) { | 1184 | if ( lse ) { |
1185 | lse->setReadOnly( false ); | 1185 | lse->setReadOnly( false ); |
1186 | lse->setDescription( "" ); | 1186 | lse->setDescription( "" ); |