3 files changed, 26 insertions, 1 deletions

diff --git a/libkcal/calendar.h b/libkcal/calendar.h
index 0a94914..66836a1 100644
--- a/libkcal/calendar.h
+++ b/libkcal/calendar.h
@@ -318,2 +318,3 @@ public:
     virtual void setCalendarEnabled( int id, bool enable ) = 0;
+    virtual void setAllCalendarEnabled( bool enable ) = 0;
     virtual void setAlarmEnabled( int id, bool enable ) = 0;
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index 45e3128..2a57724 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -192,3 +192,2 @@ void CalendarLocal::setSyncEventsReadOnly()
             ev->setReadOnly( true ); 
-            ev->setCalID( 1 );
         }
@@ -197,2 +196,3 @@ void CalendarLocal::setSyncEventsReadOnly()
 }
+
 void CalendarLocal::addCalendar( Calendar* cal )
@@ -200,6 +200,13 @@ void CalendarLocal::addCalendar( Calendar* cal )
     cal->setDontDeleteIncidencesOnClose();
+    setSyncEventsEnabled();
     {
         QPtrList<Event> EventList = cal->rawEvents();
+        QPtrList<Event> el;
         Event * ev = EventList.first();
         while ( ev ) {
+            if ( ev->uid().left( 15 ) == QString("last-syncEvent-") ) {
+                Event * se = event( ev->uid() );
+                if ( se )
+                    el.append( se );   
+            }
             ev->unRegisterObserver( cal );
@@ -209,2 +216,5 @@ void CalendarLocal::addCalendar( Calendar* cal )
         }
+         for ( ev = el.first(); ev; ev = el.next() ) {
+           deleteIncidence ( ev );
+        }
     }
@@ -1005,2 +1015,15 @@ void CalendarLocal::setCalendarRemove( int id )
 
+void CalendarLocal::setAllCalendarEnabled( bool enable )
+{
+    for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
+        it->setCalEnabled( enable );
+
+    for ( Event *it = mEventList.first(); it; it = mEventList.next() )
+        it->setCalEnabled( enable );
+
+    for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() )
+        it->setCalEnabled( enable );
+
+
+}
 void CalendarLocal::setCalendarEnabled( int id, bool enable )
diff --git a/libkcal/calendarlocal.h b/libkcal/calendarlocal.h
index eb7bf34..b70f0c9 100644
--- a/libkcal/calendarlocal.h
+++ b/libkcal/calendarlocal.h
@@ -196,2 +196,3 @@ public slots:
     void setCalendarRemove( int id );
+    void setAllCalendarEnabled( bool enable );