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
@@ -211,97 +211,97 @@ void CalendarLocal::addCalendar( Calendar* cal )
         //TodoList = cal->rawTodos();
         ev = TodoList.first();
         while ( ev ) {
             ev->unRegisterObserver( cal );
             ev->registerObserver( this );
             mTodoList.append( ev );
             setupRelations( ev );
             ev = TodoList.next();
         }
     }
     {
         QPtrList<Journal> JournalList = cal->journals();
         Journal * ev = JournalList.first();
         while ( ev ) {
             ev->unRegisterObserver( cal );
             ev->registerObserver( this );
             mJournalList.append( ev );
             ev = JournalList.next();
         }
     }
     setModified( true );
 }
 bool CalendarLocal::load( const QString &fileName )
 {
   FileStorage storage( this, fileName );
   return storage.load();
 }
 
 bool CalendarLocal::save( const QString &fileName, CalFormat *format )
 {
   FileStorage storage( this, fileName, format );
   return storage.save();
 }
 
 void CalendarLocal::stopAllTodos()
 {
     for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() )
         it->setRunning( false );
 
 }
 void CalendarLocal::close()
 {
 
   Todo * i;
   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();
 
   mEventList.setAutoDelete( false );
   mTodoList.setAutoDelete( false );
   mJournalList.setAutoDelete( false );
 
   setModified( false );
 }
     
 bool CalendarLocal::addAnniversaryNoDup( Event *event )
 {
     QString cat;
     bool isBirthday = true;
     if(  event->categoriesStr() == i18n( "Anniversary" ) ) {
         isBirthday = false;
         cat = i18n( "Anniversary" );
     } else if(  event->categoriesStr() == i18n( "Birthday" ) ) {
         isBirthday = true;
         cat = i18n( "Birthday" );
     } else {
         qDebug("addAnniversaryNoDup called without fitting category! ");
         return false;
     }
     Event * eve;
     for ( eve = mEventList.first(); eve ; eve = mEventList.next() ) {
         if ( !(eve->categories().contains( cat ) ))
             continue;
         // now we have an event with fitting category
         if ( eve->dtStart().date() != event->dtStart().date() )
             continue;
         // now we have an event with fitting category+date
         if ( eve->summary() != event->summary() )
             continue;
         // now we have an event with fitting category+date+summary
         return false;
     }
     return addEvent( event );
 
 }
 bool CalendarLocal::addEventNoDup( Event *event )
 {
     Event * eve;
     for ( eve = mEventList.first(); eve ; eve = mEventList.next() ) {
         if ( *eve == *event ) {
             //qDebug("CalendarLocal::Duplicate event found! Not inserted! ");
diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp
index f349681..53aa039 100644
--- a/libkcal/icalformatimpl.cpp
+++ b/libkcal/icalformatimpl.cpp
@@ -957,97 +957,97 @@ Event *ICalFormatImpl::readEvent(icalcomponent *vevent)
       event->setDtEnd(endDate.addDays(-1));
     }
   }
 
   // some stupid vCal exporters ignore the standard and use Description
   // instead of Summary for the default field.  Correct for this.
   if (event->summary().isEmpty() &&
       !(event->description().isEmpty())) {
     QString tmpStr = event->description().simplifyWhiteSpace();
     event->setDescription("");
     event->setSummary(tmpStr);
   }
 
   return event;
 }
 
 FreeBusy *ICalFormatImpl::readFreeBusy(icalcomponent *vfreebusy)
 {
   FreeBusy *freebusy = new FreeBusy;
 
   readIncidenceBase(vfreebusy,freebusy);
 
   icalproperty *p = icalcomponent_get_first_property(vfreebusy,ICAL_ANY_PROPERTY);
 
   icaltimetype icaltime;
   icalperiodtype icalperiod;
   QDateTime period_start, period_end;
 
   while (p) {
     icalproperty_kind kind = icalproperty_isa(p);
     switch (kind) {
 
       case ICAL_DTSTART_PROPERTY:  // start date and time
         icaltime = icalproperty_get_dtstart(p);
         freebusy->setDtStart(readICalDateTime(icaltime));
         break;
 
       case ICAL_DTEND_PROPERTY:  // start End Date and Time
         icaltime = icalproperty_get_dtend(p);
         freebusy->setDtEnd(readICalDateTime(icaltime));
         break;
 
       case ICAL_FREEBUSY_PROPERTY:  //Any FreeBusy Times
         icalperiod = icalproperty_get_freebusy(p);
         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;
     }
     p = icalcomponent_get_next_property(vfreebusy,ICAL_ANY_PROPERTY);
   }
 
   return freebusy;
 }
 
 Journal *ICalFormatImpl::readJournal(icalcomponent *vjournal)
 {
   Journal *journal = new Journal;
 
   readIncidence(vjournal,journal);
 
   if ( !journal->dtStart().isValid() && journal->created().isValid() ) {
       journal->setDtStart( journal->created() );
   }
   return journal;
 }
 
 Attendee *ICalFormatImpl::readAttendee(icalproperty *attendee)
 {
   icalparameter *p = 0;
 
   QString email = QString::fromUtf8(icalproperty_get_attendee(attendee));
 
   QString name;
   QString uid = QString::null;
   p = icalproperty_get_first_parameter(attendee,ICAL_CN_PARAMETER);
   if (p) {
     name = QString::fromUtf8(icalparameter_get_cn(p));
   } else {
   }
 
   bool rsvp=false;
   p = icalproperty_get_first_parameter(attendee,ICAL_RSVP_PARAMETER);
   if (p) {
     icalparameter_rsvp rsvpParameter = icalparameter_get_rsvp(p);
     if (rsvpParameter == ICAL_RSVP_TRUE) rsvp = true;
   }
 
   Attendee::PartStat status = Attendee::NeedsAction;
   p = icalproperty_get_first_parameter(attendee,ICAL_PARTSTAT_PARAMETER);
   if (p) {
     icalparameter_partstat partStatParameter = icalparameter_get_partstat(p);
@@ -1899,115 +1899,118 @@ bool ICalFormatImpl::populate( Calendar *cal, icalcomponent *calendar)
     } else if (strcmp(version,"2.0") != 0) {
       mParent->setException(new ErrorFormat(ErrorFormat::CalVersionUnknown));
       return false;
     }
   }
 
 
 // TODO: check for calendar format version
 #if 0
   // warn the user we might have trouble reading this unknown version.
   if ((curVO = isAPropertyOf(vcal, VCVersionProp)) != 0) {
     char *s = fakeCString(vObjectUStringZValue(curVO));
     if (strcmp(_VCAL_VERSION, s) != 0)
       if (mEnableDialogs)
         KMessageBox::sorry(mTopWidget,
                              i18n("This vCalendar file has version %1.\n"
                                   "We only support %2.")
                              .arg(s).arg(_VCAL_VERSION),
                              i18n("%1: Unknown vCalendar Version").arg(CalFormat::application()));
     deleteStr(s);
   }
 #endif
 
   // custom properties
   readCustomProperties(calendar, cal);
 
 // TODO: set time zone
 #if 0
   // set the time zone
   if ((curVO = isAPropertyOf(vcal, VCTimeZoneProp)) != 0) {
     char *s = fakeCString(vObjectUStringZValue(curVO));
     cal->setTimeZone(s);
     deleteStr(s);
   }
 #endif
 
   // Store all events with a relatedTo property in a list for post-processing
   mEventsRelate.clear();
   mTodosRelate.clear();
   // TODO: make sure that only actually added ecvens go to this lists.
 
   icalcomponent *c;
 
   // Iterate through all todos
   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
   initPropIterator(&i, vcal);
 
   // go through all the vobjects in the vcal
   while (moreIteration(&i)) {
     curVO = nextVObject(&i);
 
     /************************************************************************/
 
     // now, check to see that the object is an event or todo.
     if (strcmp(vObjectName(curVO), VCEventProp) == 0) {
 
       if ((curVOProp = isAPropertyOf(curVO, KPilotStatusProp)) != 0) {
         char *s;
         s = fakeCString(vObjectUStringZValue(curVOProp));
         // check to see if event was deleted by the kpilot conduit
         if (atoi(s) == Event::SYNCDEL) {
           deleteStr(s);
           goto SKIP;
         }
         deleteStr(s);
       }
 
       // this code checks to see if we are trying to read in an event
       // that we already find to be in the calendar.  If we find this
       // to be the case, we skip the event.
       if ((curVOProp = isAPropertyOf(curVO, VCUniqueStringProp)) != 0) {
         char *s = fakeCString(vObjectUStringZValue(curVOProp));
         QString tmpStr(s);
         deleteStr(s);
 
         if (cal->event(tmpStr)) {
           goto SKIP;
         }
         if (cal->todo(tmpStr)) {
           goto SKIP;
         }
       }
 
       if ((!(curVOProp = isAPropertyOf(curVO, VCDTstartProp))) &&
           (!(curVOProp = isAPropertyOf(curVO, VCDTendProp)))) {
         kdDebug(5800) << "found a VEvent with no DTSTART and no DTEND! Skipping..." << endl;
         goto SKIP;
       }
 
diff --git a/libkcal/journal.cpp b/libkcal/journal.cpp
index 859161f..c4e4474 100644
--- a/libkcal/journal.cpp
+++ b/libkcal/journal.cpp
@@ -1,49 +1,51 @@
 /*
     This file is part of libkcal.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include "journal.h"
 
 using namespace KCal;
 
 Journal::Journal()
 {
+    qDebug("New JJJ ");
 }
 
 Journal::~Journal()
 {
+    qDebug("delete JJJ ");
 }
 
 Incidence *Journal::clone()
 {
   return new Journal(*this);
 }
 
 
 bool KCal::operator==( const Journal& j1, const Journal& j2 )
 {
     return operator==( (const Incidence&)j1, (const Incidence&)j2 );
 }
 
 
 QDateTime Journal::getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_dt ) const
 {
     *ok = false;
     return QDateTime ();
 }