| -rw-r--r-- | kaddressbook/mainembedded.cpp | 3 | ||||
| -rw-r--r-- | korganizer/calendarview.cpp | 15 | ||||
| -rw-r--r-- | libkcal/incidence.cpp | 2 |
3 files changed, 14 insertions, 6 deletions
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp index 547d208..771bec9 100644 --- a/kaddressbook/mainembedded.cpp +++ b/kaddressbook/mainembedded.cpp @@ -75,3 +75,3 @@ int main( int argc, char **argv ) // init language - KABPrefs::instance(); + KPimGlobalPrefs::instance()->setGlobalConfig(); KAddressBookMain m ; @@ -81,3 +81,2 @@ int main( int argc, char **argv ) - KPimGlobalPrefs::instance()->setGlobalConfig(); 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 } - if ( fullDateRange && !mSyncKDE ) + if ( mSyncKDE ) { + fullDateRange = ( eventLSync->dtStart() == mLastCalendarSync ); + } + if ( fullDateRange ) mLastCalendarSync = QDateTime::currentDateTime().addDays( -100*365); @@ -1051,2 +1054,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int inL = inR->clone(); + inL->setIDStr( ":" ); local->addIncidence( inL ); @@ -1057,3 +1061,5 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int inR->setLastModified( modifiedCalendar ); - local->addIncidence( inR->clone() ); + inL = inR->clone(); + inL->setIDStr( ":" ); + local->addIncidence( inL ); ++addedEvent; @@ -1106,2 +1112,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int inR = inL->clone(); + inR->setIDStr( ":" ); inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); @@ -1119,3 +1126,5 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int inL->setLastModified( modifiedCalendar ); - remote->addIncidence( inL->clone() ); + inR = inL->clone(); + inR->setIDStr( ":" ); + remote->addIncidence( inR ); } diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp index 55ac6d4..5a9ef0e 100644 --- a/libkcal/incidence.cpp +++ b/libkcal/incidence.cpp @@ -183,3 +183,3 @@ void Incidence::recreate() setRevision(0); - + setIDStr( ":" ); setLastModified(QDateTime::currentDateTime()); |