| -rw-r--r-- | libkcal/calendar.cpp | 2 | ||||
| -rw-r--r-- | libkcal/calendarlocal.cpp | 12 | ||||
| -rw-r--r-- | libkcal/incidencebase.cpp | 7 | ||||
| -rw-r--r-- | libkcal/incidencebase.h | 1 | ||||
| -rw-r--r-- | libkdepim/ksyncmanager.cpp | 2 | ||||
| -rw-r--r-- | libkdepim/ksyncprefsdialog.cpp | 2 |
6 files changed, 17 insertions, 9 deletions
diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp index b1806ee..8535191 100644 --- a/libkcal/calendar.cpp +++ b/libkcal/calendar.cpp @@ -382,3 +382,3 @@ bool Calendar::addIncidence(Incidence *i) if ( i->calID() == 0 ) - i->setCalID( mDefaultCalendar ); + i->setCalID_block( mDefaultCalendar ); i->setCalEnabled( true ); diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp index c82ea92..b02f706 100644 --- a/libkcal/calendarlocal.cpp +++ b/libkcal/calendarlocal.cpp @@ -151,3 +151,3 @@ bool CalendarLocal::mergeCalendar( Calendar* remote ) inL = inR->clone(); - inL->setCalID( calID ); + inL->setCalID_block( calID ); addIncidence( inL ); @@ -156,3 +156,3 @@ bool CalendarLocal::mergeCalendar( Calendar* remote ) inL = inR->clone(); - inL->setCalID( 0 );// add to default cal + inL->setCalID_block( 0 );// add to default cal addIncidence( inL ); @@ -210,3 +210,3 @@ void CalendarLocal::addCalendar( Calendar* cal ) el.append( se ); - ev->setCalID( 1 ); + ev->setCalID_block( 1 ); } @@ -344,3 +344,3 @@ bool CalendarLocal::addEvent( Event *event ) if ( event->calID() == 0 ) - event->setCalID( mDefaultCalendar ); + event->setCalID_block( mDefaultCalendar ); event->setCalEnabled( true ); @@ -398,3 +398,3 @@ bool CalendarLocal::addTodo( Todo *todo ) if ( todo->calID() == 0 ) - todo->setCalID( mDefaultCalendar ); + todo->setCalID_block( mDefaultCalendar ); todo->setCalEnabled( true ); @@ -926,3 +926,3 @@ bool CalendarLocal::addJournal(Journal *journal) if ( journal->calID() == 0 ) - journal->setCalID( mDefaultCalendar ); + journal->setCalID_block( mDefaultCalendar ); journal->setCalEnabled( true ); diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp index cfef973..56c0560 100644 --- a/libkcal/incidencebase.cpp +++ b/libkcal/incidencebase.cpp @@ -154,2 +154,9 @@ void IncidenceBase::setCalID( int id ) if ( mCalID > 0 ) { + updated(); + } + mCalID = id; +} +void IncidenceBase::setCalID_block( int id ) +{ + if ( mCalID > 0 ) { blockLastModified = true; diff --git a/libkcal/incidencebase.h b/libkcal/incidencebase.h index 444d4c4..3edc03b 100644 --- a/libkcal/incidencebase.h +++ b/libkcal/incidencebase.h @@ -145,2 +145,3 @@ class IncidenceBase : public CustomProperties void setCalID( int id ); + void setCalID_block( int id ); int calID() const; diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index fa7804e..0109c02 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp @@ -1182,3 +1182,3 @@ void KSyncManager::syncPi() ++startLocal; - + mAskForPreferences = false; } diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp index 744a914..1f9afcb 100644 --- a/libkdepim/ksyncprefsdialog.cpp +++ b/libkdepim/ksyncprefsdialog.cpp @@ -371,3 +371,3 @@ void KSyncPrefsDialog::setupSyncAlgTab() - lab = new QLabel( i18n("Local/remote Resource sync partners"), piWidget); + lab = new QLabel( i18n("Local/remote Resource sync partners (Leave empty to not sync)"), piWidget); mTableBox = new QHBox( piWidget ); |