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 | |
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 | |||
@@ -962,3 +962,6 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
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); |
@@ -1051,2 +1054,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1051 | inL = inR->clone(); | 1054 | inL = inR->clone(); |
1055 | inL->setIDStr( ":" ); | ||
1052 | local->addIncidence( inL ); | 1056 | local->addIncidence( inL ); |
@@ -1057,3 +1061,5 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
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; |
@@ -1106,2 +1112,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1106 | inR = inL->clone(); | 1112 | inR = inL->clone(); |
1113 | inR->setIDStr( ":" ); | ||
1107 | inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); | 1114 | inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); |
@@ -1119,3 +1126,5 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
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 | } |