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
@@ -380,7 +380,7 @@ bool Calendar::addIncidence(Incidence *i)
 {
   Incidence::AddVisitor<Calendar> v(this);
   if ( i->calID() == 0 )
-      i->setCalID( mDefaultCalendar );
+      i->setCalID_block( mDefaultCalendar );
   i->setCalEnabled( true );
   return i->accept(v);
 }
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index c82ea92..b02f706 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -149,12 +149,12 @@ bool CalendarLocal::mergeCalendar( Calendar* remote  )
                 int calID = inL->calID();
                 deleteIncidence( inL );
                 inL = inR->clone();
-                inL->setCalID( calID );
+                inL->setCalID_block( calID );
                 addIncidence( inL );
             }
         } else {
             inL = inR->clone();
-            inL->setCalID( 0 );// add to default cal
+            inL->setCalID_block( 0 );// add to default cal
             addIncidence( inL );
         }
         inR = er.next();
@@ -208,7 +208,7 @@ void CalendarLocal::addCalendar( Calendar* cal )
                 Event * se = event( ev->uid() );
                 if ( se )
                     el.append( se );    
-                ev->setCalID( 1 );
+                ev->setCalID_block( 1 );
             }
             ev->unRegisterObserver( cal );
             ev->registerObserver( this );
@@ -342,7 +342,7 @@ bool CalendarLocal::addEvent( Event *event )
 
   setModified( true );
   if ( event->calID() == 0 )
-      event->setCalID( mDefaultCalendar );
+      event->setCalID_block( mDefaultCalendar );
   event->setCalEnabled( true );
 
   return true;
@@ -396,7 +396,7 @@ bool CalendarLocal::addTodo( Todo *todo )
 
   setModified( true );
   if ( todo->calID() == 0 )
-  todo->setCalID( mDefaultCalendar );
+  todo->setCalID_block( mDefaultCalendar );
   todo->setCalEnabled( true );
   return true;
 }
@@ -924,7 +924,7 @@ bool CalendarLocal::addJournal(Journal *journal)
 
   setModified( true );
   if ( journal->calID() == 0 )
-      journal->setCalID( mDefaultCalendar );
+      journal->setCalID_block( mDefaultCalendar );
   journal->setCalEnabled( true );
   return true;
 }
diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp
index cfef973..56c0560 100644
--- a/libkcal/incidencebase.cpp
+++ b/libkcal/incidencebase.cpp
@@ -152,6 +152,13 @@ void IncidenceBase::setTagged( bool b)
 void IncidenceBase::setCalID( int id )
 {
     if ( mCalID > 0 ) {
+        updated();
+    }
+    mCalID = id;
+}
+void IncidenceBase::setCalID_block( int id )
+{
+    if ( mCalID > 0 ) {
         blockLastModified = true;
         updated();
         blockLastModified = false;
diff --git a/libkcal/incidencebase.h b/libkcal/incidencebase.h
index 444d4c4..3edc03b 100644
--- a/libkcal/incidencebase.h
+++ b/libkcal/incidencebase.h
@@ -143,6 +143,7 @@ class IncidenceBase : public CustomProperties
     void unRegisterObserver( Observer * );
     void updated();
     void setCalID( int id );
+    void setCalID_block( int id );
     int calID() const;
     void setCalEnabled( bool );
     bool calEnabled() const; 
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index fa7804e..0109c02 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -1180,7 +1180,7 @@ void KSyncManager::syncPi()
             }
             ++startRemote;
             ++startLocal; 
-           
+            mAskForPreferences = false;
         }
         mPisyncFinished = true;
     } else {
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp
index 744a914..1f9afcb 100644
--- a/libkdepim/ksyncprefsdialog.cpp
+++ b/libkdepim/ksyncprefsdialog.cpp
@@ -369,7 +369,7 @@ void KSyncPrefsDialog::setupSyncAlgTab()
        mRemotePortAB = new QLineEdit(temphb);
        mRemotePortPWM = new QLineEdit(temphb);
 
-       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 );
        mResTableKopi = new QTable( 1, 1, mTableBox );
        mResTableKapi = new QTable( 1, 1, mTableBox );