3 files changed, 10 insertions, 5 deletions

diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index eef8327..5baa7dc 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -255,9 +255,9 @@ void CalendarLocal::close()
   for( i = mTodoList.first(); i; i = mTodoList.next() ) i->setRunning(false);
 
   mEventList.setAutoDelete( true );
   mTodoList.setAutoDelete( true );
-  mJournalList.setAutoDelete( false );
+  mJournalList.setAutoDelete( true );
 
   mEventList.clear();
   mTodoList.clear();
   mJournalList.clear();
diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp
index f349681..53aa039 100644
--- a/libkcal/icalformatimpl.cpp
+++ b/libkcal/icalformatimpl.cpp
@@ -1001,9 +1001,9 @@ FreeBusy *ICalFormatImpl::readFreeBusy(icalcomponent *vfreebusy)
         period_start = readICalDateTime(icalperiod.start);
         period_end = readICalDateTime(icalperiod.end);
         freebusy->addPeriod(period_start, period_end);
         break;
-
+        
       default:
         kdDebug(5800) << "ICALFormat::readIncidence(): Unknown property: " << kind
                   << endl;
       break;
@@ -1943,27 +1943,30 @@ bool ICalFormatImpl::populate( Calendar *cal, icalcomponent *calendar)
   c = icalcomponent_get_first_component(calendar,ICAL_VTODO_COMPONENT);
   while (c) {
 //    kdDebug(5800) << "----Todo found" << endl;
     Todo *todo = readTodo(c);
-    if (!cal->todo(todo->uid())) cal->addTodo(todo);
+    if (!cal->todo(todo->uid())) 
+        cal->addTodo(todo);
     c = icalcomponent_get_next_component(calendar,ICAL_VTODO_COMPONENT);
   }
 
   // Iterate through all events
   c = icalcomponent_get_first_component(calendar,ICAL_VEVENT_COMPONENT);
   while (c) {
 //    kdDebug(5800) << "----Event found" << endl;
     Event *event = readEvent(c);
-    if (!cal->event(event->uid())) cal->addEvent(event);
+    if (!cal->event(event->uid())) 
+        cal->addEvent(event);
     c = icalcomponent_get_next_component(calendar,ICAL_VEVENT_COMPONENT);
   }
 
   // Iterate through all journals
   c = icalcomponent_get_first_component(calendar,ICAL_VJOURNAL_COMPONENT);
   while (c) {
 //    kdDebug(5800) << "----Journal found" << endl;
     Journal *journal = readJournal(c);
-    if (!cal->journal(journal->uid())) cal->addJournal(journal);
+    if (!cal->journal(journal->uid()))
+        cal->addJournal(journal);
     c = icalcomponent_get_next_component(calendar,ICAL_VJOURNAL_COMPONENT);
   }
 
 #if 0
diff --git a/libkcal/journal.cpp b/libkcal/journal.cpp
index 859161f..c4e4474 100644
--- a/libkcal/journal.cpp
+++ b/libkcal/journal.cpp
@@ -23,12 +23,14 @@
 using namespace KCal;
 
 Journal::Journal()
 {
+    qDebug("New JJJ ");
 }
 
 Journal::~Journal()
 {
+    qDebug("delete JJJ ");
 }
 
 Incidence *Journal::clone()
 {