-rw-r--r-- | korganizer/calendarview.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index fab4540..5150455 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -728,5 +728,5 @@ int CalendarView::takeEvent( Incidence* local, Incidence* remote, int mode , b | |||
728 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 728 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
729 | bool remCh, locCh; | 729 | bool remCh, locCh; |
730 | remCh = ( remote->zaurusUid() != local->zaurusUid() ); | 730 | remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) ); |
731 | locCh = ( local->lastModified() > mLastCalendarSync ); | 731 | locCh = ( local->lastModified() > mLastCalendarSync ); |
732 | //qDebug("locCh %d remCh %d locuid %d remuid %d", locCh, remCh,local->zaurusUid(), remote->zaurusUid() ); | 732 | //qDebug("locCh %d remCh %d locuid %d remuid %d", locCh, remCh,local->zaurusUid(), remote->zaurusUid() ); |
@@ -774,5 +774,5 @@ int CalendarView::takeEvent( Incidence* local, Incidence* remote, int mode , b | |||
774 | //qDebug("equal "); | 774 | //qDebug("equal "); |
775 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 775 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
776 | local->setZaurusUid( remote->zaurusUid() ); | 776 | local->setCsum( mCurrentSyncDevice, remote->getCsum(mCurrentSyncDevice) ); |
777 | } | 777 | } |
778 | if ( mode < SYNC_PREF_FORCE_LOCAL ) | 778 | if ( mode < SYNC_PREF_FORCE_LOCAL ) |
@@ -896,11 +896,11 @@ void CalendarView::checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* t | |||
896 | 896 | ||
897 | while ( eve ) { | 897 | while ( eve ) { |
898 | int id = toDelete->getID( eve->uid().mid( 15 ) ); // this is the sync profile name | 898 | QString id = toDelete->getID( eve->uid().mid( 15 ) ); // this is the sync profile name |
899 | if ( id >= 0 ) { | 899 | if ( !id.isEmpty() ) { |
900 | QString des = eve->description(); | 900 | QString des = eve->description(); |
901 | QString pref = "e"; | 901 | QString pref = "e"; |
902 | if ( toDelete->type() == "Todo" ) | 902 | if ( toDelete->type() == "Todo" ) |
903 | pref = "t"; | 903 | pref = "t"; |
904 | des += pref+ QString::number ( id ) + ","; | 904 | des += pref+ id + ","; |
905 | eve->setReadOnly( false ); | 905 | eve->setReadOnly( false ); |
906 | eve->setDescription( des ); | 906 | eve->setDescription( des ); |
@@ -1014,5 +1014,5 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1014 | return false; | 1014 | return false; |
1015 | if ( take == 1 ) {// take local | 1015 | if ( take == 1 ) {// take local |
1016 | inL->setZaurusUid( inR->zaurusUid() ); | 1016 | inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) ); |
1017 | remote->deleteIncidence( inR ); | 1017 | remote->deleteIncidence( inR ); |
1018 | if ( inL->revision() < maxrev ) | 1018 | if ( inL->revision() < maxrev ) |
@@ -1034,5 +1034,5 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1034 | if ( inR->type() == "Todo" ) | 1034 | if ( inR->type() == "Todo" ) |
1035 | pref = "t"; | 1035 | pref = "t"; |
1036 | if ( des.find(pref+QString::number( inR->getID(mCurrentSyncDevice) ) +"," ) >= 0 && mode != 5) { // delete it | 1036 | if ( des.find(pref+ inR->getID(mCurrentSyncDevice) +"," ) >= 0 && mode != 5) { // delete it |
1037 | inR->setTempSyncStat( SYNC_TEMPSTATE_DELETE ); | 1037 | inR->setTempSyncStat( SYNC_TEMPSTATE_DELETE ); |
1038 | //remote->deleteIncidence( inR ); | 1038 | //remote->deleteIncidence( inR ); |
@@ -1084,10 +1084,10 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1084 | if ( ! inR ) { | 1084 | if ( ! inR ) { |
1085 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 1085 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
1086 | if ( inL->getID(mCurrentSyncDevice) >= 0 && mode != 4 ) { | 1086 | if ( !inL->getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) { |
1087 | local->deleteIncidence( inL ); | 1087 | local->deleteIncidence( inL ); |
1088 | ++deletedEventL; | 1088 | ++deletedEventL; |
1089 | } else { | 1089 | } else { |
1090 | if ( ! KOPrefs::instance()->mWriteBackExistingOnly ) { | 1090 | if ( ! KOPrefs::instance()->mWriteBackExistingOnly ) { |
1091 | inL->setID(mCurrentSyncDevice, -1 ); | 1091 | inL->removeID(mCurrentSyncDevice ); |
1092 | ++addedEventR; | 1092 | ++addedEventR; |
1093 | inL->setLastModified( modifiedCalendar ); | 1093 | inL->setLastModified( modifiedCalendar ); |
@@ -1209,5 +1209,5 @@ void CalendarView::syncSharp() | |||
1209 | if ( loc ) { | 1209 | if ( loc ) { |
1210 | loc->setID(mCurrentSyncDevice, inc->getID(mCurrentSyncDevice) ); | 1210 | loc->setID(mCurrentSyncDevice, inc->getID(mCurrentSyncDevice) ); |
1211 | loc->setZaurusUid( inc->zaurusUid() ); | 1211 | loc->setCsum( mCurrentSyncDevice, inc->getCsum(mCurrentSyncDevice) ); |
1212 | } | 1212 | } |
1213 | } | 1213 | } |