author | zautrix <zautrix> | 2004-10-26 20:04:29 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-26 20:04:29 (UTC) |
commit | 8b111ae30fc51a4a580b8d485bef8ad28b0dde84 (patch) (unidiff) | |
tree | fb4cf20f5675e5ff2221ed6eea51785bdd65616c /korganizer/calendarview.cpp | |
parent | 62e91b888de607fa5a9f9c0fba807287e57d5d5c (diff) | |
download | kdepimpi-8b111ae30fc51a4a580b8d485bef8ad28b0dde84.zip kdepimpi-8b111ae30fc51a4a580b8d485bef8ad28b0dde84.tar.gz kdepimpi-8b111ae30fc51a4a580b8d485bef8ad28b0dde84.tar.bz2 |
fix in kapi translation call, clone fix and kde first sync fix
-rw-r--r-- | korganizer/calendarview.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 284ddbf..2ccccfa 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -955,17 +955,20 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
955 | if ( ! fullDateRange ) { | 955 | if ( ! fullDateRange ) { |
956 | if ( eventLSync->dtStart() != eventRSync->dtStart() ) { | 956 | if ( eventLSync->dtStart() != eventRSync->dtStart() ) { |
957 | 957 | ||
958 | // qDebug("set fulldate to true %s %s" ,eventLSync->dtStart().toString().latin1(), eventRSync->dtStart().toString().latin1() ); | 958 | // qDebug("set fulldate to true %s %s" ,eventLSync->dtStart().toString().latin1(), eventRSync->dtStart().toString().latin1() ); |
959 | //qDebug("%d %d %d %d ", eventLSync->dtStart().time().second(), eventLSync->dtStart().time().msec() , eventRSync->dtStart().time().second(), eventRSync->dtStart().time().msec()); | 959 | //qDebug("%d %d %d %d ", eventLSync->dtStart().time().second(), eventLSync->dtStart().time().msec() , eventRSync->dtStart().time().second(), eventRSync->dtStart().time().msec()); |
960 | fullDateRange = true; | 960 | fullDateRange = true; |
961 | } | 961 | } |
962 | } | 962 | } |
963 | if ( fullDateRange && !mSyncKDE ) | 963 | if ( mSyncKDE ) { |
964 | fullDateRange = ( eventLSync->dtStart() == mLastCalendarSync ); | ||
965 | } | ||
966 | if ( fullDateRange ) | ||
964 | mLastCalendarSync = QDateTime::currentDateTime().addDays( -100*365); | 967 | mLastCalendarSync = QDateTime::currentDateTime().addDays( -100*365); |
965 | else | 968 | else |
966 | mLastCalendarSync = eventLSync->dtStart(); | 969 | mLastCalendarSync = eventLSync->dtStart(); |
967 | // for resyncing if own file has changed | 970 | // for resyncing if own file has changed |
968 | if ( mCurrentSyncDevice == "deleteaftersync" ) { | 971 | if ( mCurrentSyncDevice == "deleteaftersync" ) { |
969 | mLastCalendarSync = loadedFileVersion; | 972 | mLastCalendarSync = loadedFileVersion; |
970 | //qDebug("setting mLastCalendarSync "); | 973 | //qDebug("setting mLastCalendarSync "); |
971 | } | 974 | } |
@@ -1044,23 +1047,26 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1044 | pref = "t"; | 1047 | pref = "t"; |
1045 | if ( des.find(pref+ inR->getID(mCurrentSyncDevice) +"," ) >= 0 && mode != 5) { // delete it | 1048 | if ( des.find(pref+ inR->getID(mCurrentSyncDevice) +"," ) >= 0 && mode != 5) { // delete it |
1046 | inR->setTempSyncStat( SYNC_TEMPSTATE_DELETE ); | 1049 | inR->setTempSyncStat( SYNC_TEMPSTATE_DELETE ); |
1047 | //remote->deleteIncidence( inR ); | 1050 | //remote->deleteIncidence( inR ); |
1048 | ++deletedEventR; | 1051 | ++deletedEventR; |
1049 | } else { | 1052 | } else { |
1050 | inR->setLastModified( modifiedCalendar ); | 1053 | inR->setLastModified( modifiedCalendar ); |
1051 | inL = inR->clone(); | 1054 | inL = inR->clone(); |
1055 | inL->setIDStr( ":" ); | ||
1052 | local->addIncidence( inL ); | 1056 | local->addIncidence( inL ); |
1053 | ++addedEvent; | 1057 | ++addedEvent; |
1054 | } | 1058 | } |
1055 | } else { | 1059 | } else { |
1056 | if ( inR->lastModified() > mLastCalendarSync || mode == 5 ) { | 1060 | if ( inR->lastModified() > mLastCalendarSync || mode == 5 ) { |
1057 | inR->setLastModified( modifiedCalendar ); | 1061 | inR->setLastModified( modifiedCalendar ); |
1058 | local->addIncidence( inR->clone() ); | 1062 | inL = inR->clone(); |
1063 | inL->setIDStr( ":" ); | ||
1064 | local->addIncidence( inL ); | ||
1059 | ++addedEvent; | 1065 | ++addedEvent; |
1060 | } else { | 1066 | } else { |
1061 | checkExternSyncEvent(eventRSyncSharp, inR); | 1067 | checkExternSyncEvent(eventRSyncSharp, inR); |
1062 | remote->deleteIncidence( inR ); | 1068 | remote->deleteIncidence( inR ); |
1063 | ++deletedEventR; | 1069 | ++deletedEventR; |
1064 | } | 1070 | } |
1065 | } | 1071 | } |
1066 | } | 1072 | } |
@@ -1099,30 +1105,33 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1099 | ++deletedEventL; | 1105 | ++deletedEventL; |
1100 | } else { | 1106 | } else { |
1101 | if ( ! mSyncManager->mWriteBackExistingOnly ) { | 1107 | if ( ! mSyncManager->mWriteBackExistingOnly ) { |
1102 | inL->removeID(mCurrentSyncDevice ); | 1108 | inL->removeID(mCurrentSyncDevice ); |
1103 | ++addedEventR; | 1109 | ++addedEventR; |
1104 | //qDebug("remote added Incidence %s ", inL->summary().latin1()); | 1110 | //qDebug("remote added Incidence %s ", inL->summary().latin1()); |
1105 | inL->setLastModified( modifiedCalendar ); | 1111 | inL->setLastModified( modifiedCalendar ); |
1106 | inR = inL->clone(); | 1112 | inR = inL->clone(); |
1113 | inR->setIDStr( ":" ); | ||
1107 | inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); | 1114 | inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); |
1108 | remote->addIncidence( inR ); | 1115 | remote->addIncidence( inR ); |
1109 | } | 1116 | } |
1110 | } | 1117 | } |
1111 | } else { | 1118 | } else { |
1112 | if ( inL->lastModified() < mLastCalendarSync && mode != 4 ) { | 1119 | if ( inL->lastModified() < mLastCalendarSync && mode != 4 ) { |
1113 | checkExternSyncEvent(eventLSyncSharp, inL); | 1120 | checkExternSyncEvent(eventLSyncSharp, inL); |
1114 | local->deleteIncidence( inL ); | 1121 | local->deleteIncidence( inL ); |
1115 | ++deletedEventL; | 1122 | ++deletedEventL; |
1116 | } else { | 1123 | } else { |
1117 | if ( ! mSyncManager->mWriteBackExistingOnly ) { | 1124 | if ( ! mSyncManager->mWriteBackExistingOnly ) { |
1118 | ++addedEventR; | 1125 | ++addedEventR; |
1119 | inL->setLastModified( modifiedCalendar ); | 1126 | inL->setLastModified( modifiedCalendar ); |
1120 | remote->addIncidence( inL->clone() ); | 1127 | inR = inL->clone(); |
1128 | inR->setIDStr( ":" ); | ||
1129 | remote->addIncidence( inR ); | ||
1121 | } | 1130 | } |
1122 | } | 1131 | } |
1123 | } | 1132 | } |
1124 | } | 1133 | } |
1125 | } | 1134 | } |
1126 | inL = el.next(); | 1135 | inL = el.next(); |
1127 | } | 1136 | } |
1128 | int delFut = 0; | 1137 | int delFut = 0; |