3 files changed, 24 insertions, 12 deletions

diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index 5baa7dc..e8c969f 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -267,9 +267,22 @@ void CalendarLocal::close()
   mJournalList.setAutoDelete( false );
 
   setModified( false );
 }
-    
+ void CalendarLocal::clearUndo()
+{
+    if ( mUndoIncidence ) {
+        if ( mUndoIncidence->typeID() == eventID )
+            delete  ((Event*) mUndoIncidence) ;
+        else if ( mUndoIncidence->typeID() == todoID )
+            delete ( (Todo*) mUndoIncidence );
+        else if ( mUndoIncidence->typeID() == journalID )
+            delete ( (Journal*) mUndoIncidence );
+        else 
+            delete mUndoIncidence;
+    }
+    mUndoIncidence = 0;
+}   
 bool CalendarLocal::addAnniversaryNoDup( Event *event )
 {
     QString cat;
     bool isBirthday = true;
@@ -326,10 +339,10 @@ bool CalendarLocal::addEvent( Event *event )
 }
 
 void CalendarLocal::deleteEvent( Event *event )
 {
-    if ( mUndoIncidence ) delete mUndoIncidence;
-    mUndoIncidence = event->clone();
+    clearUndo();
+    mUndoIncidence = event;
     if ( mEventList.removeRef( event ) ) {
         setModified( true );
     }
 }
@@ -381,11 +394,11 @@ bool CalendarLocal::addTodo( Todo *todo )
 
 void CalendarLocal::deleteTodo( Todo *todo )
 {
   // Handle orphaned children
-    if ( mUndoIncidence ) delete mUndoIncidence;
+    clearUndo();
     removeRelations( todo );
-    mUndoIncidence = todo->clone();
+    mUndoIncidence = todo;
 
   if ( mTodoList.removeRef( todo ) ) {
     setModified( true );
   }
@@ -885,11 +898,10 @@ bool CalendarLocal::addJournal(Journal *journal)
 }
 
 void CalendarLocal::deleteJournal( Journal *journal )
 {
-    if ( mUndoIncidence ) delete mUndoIncidence;
-    mUndoIncidence = journal->clone();
-    mUndoIncidence->setSummary( mUndoIncidence->description().left(25));
+    clearUndo();
+    mUndoIncidence = journal;
   if ( mJournalList.removeRef(journal) ) {
     setModified( true );
   }
 }
@@ -966,10 +978,9 @@ void CalendarLocal::setCalendarRemove( int id )
             ev = JournalList.next();
         }
     }
 
-    if ( mUndoIncidence ) delete mUndoIncidence;
-    mUndoIncidence = 0;
+    clearUndo();
 
 }
 
 void CalendarLocal::setCalendarEnabled( int id, bool enable )
diff --git a/libkcal/calendarlocal.h b/libkcal/calendarlocal.h
index a7a85c8..ae7e30c 100644
--- a/libkcal/calendarlocal.h
+++ b/libkcal/calendarlocal.h
@@ -68,8 +68,9 @@ class CalendarLocal : public Calendar
     /**
       Clears out the current calendar, freeing all used memory etc. etc.
     */
     void close();
+    void clearUndo();
 
     void save() {}
   
     /**
diff --git a/libkcal/journal.cpp b/libkcal/journal.cpp
index c4e4474..328db46 100644
--- a/libkcal/journal.cpp
+++ b/libkcal/journal.cpp
@@ -23,14 +23,14 @@
 using namespace KCal;
 
 Journal::Journal()
 {
-    qDebug("New JJJ ");
+   
 }
 
 Journal::~Journal()
 {
-    qDebug("delete JJJ ");
+   
 }
 
 Incidence *Journal::clone()
 {