sync

1 files changed, 16 insertions, 7 deletions

diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index 980663f..8a5a76f 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -261,5 +261,5 @@ void CalendarLocal::addCalendar( Calendar* cal )
     setSyncEventsEnabled();
+    QPtrList<Incidence> incList;
     {
         QPtrList<Event> EventList = cal->rawEvents();
-        QPtrList<Event> el;
         Event * ev = EventList.first();
@@ -267,7 +267,7 @@ void CalendarLocal::addCalendar( Calendar* cal )
             if ( ev->uid().left( 15 ) == QString("last-syncEvent-") ) {
-                Event * se = event( ev->uid() );
-                if ( se )
-                    el.append( se );    
                 ev->setCalID_block( 1 );
             }
+            Event * se = event( ev->uid() );
+            if ( se )
+                incList.append( se );    
             ev->unRegisterObserver( cal );
@@ -277,5 +277,3 @@ void CalendarLocal::addCalendar( Calendar* cal )
         }
-         for ( ev = el.first(); ev; ev = el.next() ) {
-           deleteIncidence ( ev );
-        }
+         
     }
@@ -292,2 +290,5 @@ void CalendarLocal::addCalendar( Calendar* cal )
         while ( ev ) {
+            Todo * se = todo( ev->uid() );
+            if ( se )
+                incList.append( se );    
             ev->unRegisterObserver( cal );
@@ -303,2 +304,5 @@ void CalendarLocal::addCalendar( Calendar* cal )
         while ( ev ) {
+            Journal * se = journal( ev->uid() );
+            if ( se )
+                incList.append( se );    
             ev->unRegisterObserver( cal );
@@ -309,2 +313,7 @@ void CalendarLocal::addCalendar( Calendar* cal )
     }
+    {
+        for (Incidence * ev = incList.first(); ev; ev = incList.next() ) {
+            deleteIncidence ( ev );
+        }
+    }
     setModified( true );