5 files changed, 19 insertions, 5 deletions

diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index eea9a4d..4aeb20c 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -1104,17 +1104,21 @@ void MonthViewCell::contextMenu( QListBoxItem *item )
     if ( !item )  {
         mMonthView->showContextMenu( 0 );
         return;
     }
     //selection( item );
     //qApp->processEvents();
     MonthViewItem *eventItem = static_cast<MonthViewItem *>( item );
     Incidence *incidence = eventItem->incidence();
-    if ( incidence ) mMonthView->showContextMenu( incidence );
+    if ( incidence ) {
+        mMonthView->showContextMenu( incidence );
+        selection( item );
+        doHighLight( incidence );
+    }
 }
 
 void MonthViewCell::selection( QListBoxItem *item )
 {
     if ( !item ) {
         emit highlightIncidence( 0 , this, 0 );
         return;
     }
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index e37a7ad..eef8327 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -60,16 +60,17 @@ CalendarLocal::CalendarLocal(const QString &timeZoneId)
 void CalendarLocal::init()
 {
     mNextAlarmIncidence = 0;
 }
 
 
 CalendarLocal::~CalendarLocal()
 {
+    registerObserver( 0 );
     if ( mDeleteIncidencesOnClose )
         close();
 }
 bool CalendarLocal::mergeCalendarFile( QString name )
 {
     CalendarLocal calendar( timeZoneId() );
     calendar.setDefaultCalendar( 1 );
     if ( calendar.load( name ) ) {
diff --git a/libkcal/icalformat.cpp b/libkcal/icalformat.cpp
index 5877406..6f3a799 100644
--- a/libkcal/icalformat.cpp
+++ b/libkcal/icalformat.cpp
@@ -45,18 +45,19 @@ extern "C" {
 
 #include "icalformat.h"
 #include "icalformatimpl.h"
 
 #define _ICAL_VERSION "2.0"
 
 using namespace KCal;
 
-ICalFormat::ICalFormat( )
+ICalFormat::ICalFormat(  bool pe )
 {
+    mProcessEvents = pe;
    mImpl = new ICalFormatImpl( this );
    tzOffsetMin = 0;
    //qDebug("new ICalFormat() ");
 }
 
 ICalFormat::~ICalFormat()
 {
   delete mImpl; 
@@ -184,40 +185,46 @@ QString ICalFormat::toString( Calendar *cal )
  
   // todos 
   QPtrList<Todo> todoList = cal->rawTodos();
   QPtrListIterator<Todo> qlt(todoList);
   for (; qlt.current(); ++qlt) {
     component = mImpl->writeTodo(qlt.current());
     icalcomponent_add_component(calendar,component);
     //qDebug(" todos ");
+    if ( mProcessEvents ) {
+        //qDebug("mProcessEvents ");
     qApp->processEvents();
   }
+  }
   // events
   QPtrList<Event> events = cal->rawEvents();
   Event *ev;
   for(ev=events.first();ev;ev=events.next()) {
     component = mImpl->writeEvent(ev);
     icalcomponent_add_component(calendar,component);
     //qDebug("events ");
+    if ( mProcessEvents )
     qApp->processEvents();
   }
  
   // journals
   QPtrList<Journal> journals = cal->journals();
   Journal *j;
   for(j=journals.first();j;j=journals.next()) {
     component = mImpl->writeJournal(j);
     icalcomponent_add_component(calendar,component);
     //qDebug("journals ");
+    if ( mProcessEvents )
     qApp->processEvents(); 
   }
    const char *text; 
   QString ret =""; 
   text = icalcomponent_as_ical_string( calendar ); 
+  if ( mProcessEvents )
   qApp->processEvents(); 
 
   // text = "BEGIN:VCALENDAR\nPRODID\n :-//K Desktop Environment//NONSGML libkcal 3.1//EN\nVERSION\n :2.0\nBEGIN:VEVENT\nDTSTAMP\n :20031231T213514Z\nORGANIZER\n :MAILTO:lutz@putz.de\nCREATED\n :20031231T213513Z\nUID\n :libkcal-1295166342.120\nSEQUENCE\n :0\nLAST-MODIFIED\n :20031231T213513Z\nSUMMARY\n :test1\nCLASS\n :PUBLIC\nPRIORITY\n :3\nDTSTART\n :20040101T090000Z\nDTEND\n :20040101T110000Z\nTRANSP\n :OPAQUE\nEND:VEVENT\nEND:VCALENDAR\n";
 
 
    if ( text ) {
        ret = QString ( text );
    }
diff --git a/libkcal/icalformat.h b/libkcal/icalformat.h
index 485ab6e..a770dbb 100644
--- a/libkcal/icalformat.h
+++ b/libkcal/icalformat.h
@@ -35,17 +35,17 @@ class ICalFormatImpl;
   loading/saving/converting iCalendar format data into the internal KOrganizer
   representation as Calendar and Events.
 
   @short iCalendar format implementation
 */
 class ICalFormat : public CalFormat {
   public:
     /** Create new iCalendar format. */
-    ICalFormat( );
+    ICalFormat( bool pe = true);
     virtual ~ICalFormat();
 
     /**
       Loads a calendar on disk in iCalendar format into calendar.
       Returns true if successful, else returns false. Provides more error
       information by exception().
       @param calendar Calendar object to be filled.
       @param fileName The name of the calendar file on disk.
@@ -98,16 +98,17 @@ class ICalFormat : public CalFormat {
     /** Set id of used time zone and whether this time zone is UTC or not. */
     void setTimeZone( const QString &id, bool utc );
     QString timeZoneId() const;
     int timeOffset();
     const char * tzString();
     bool utc() const;
 
   private:
+    bool mProcessEvents;
     ICalFormatImpl *mImpl;
     QString mTimeZoneId;
     QCString mTzString;
     int tzOffsetMin;
     bool mUtc;
 };
 
 }
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp
index 4ada2d8..7bf756a 100644
--- a/libkcal/todo.cpp
+++ b/libkcal/todo.cpp
@@ -61,16 +61,17 @@ Todo::~Todo()
     //qDebug("Todo::~Todo() ");
 }
 
 void Todo::setRunningFalse( QString s )
 {
     if ( ! mRunning )
         return;
     mRunning = false;
+    if ( mRunSaveTimer )
     mRunSaveTimer->stop();
     saveRunningInfoToFile( s );
 }
 void Todo::stopRunning()
 {
     if ( !mRunning )
         return;
     if ( mRunSaveTimer )
@@ -134,17 +135,17 @@ void Todo::saveRunningInfoToFile( QString comment )
     if ( !comment.isEmpty() ) {
         QString des = to->description();
         if ( des.isEmpty () )
             to->setDescription( "TT-Note: " + comment );
         else
             to->setDescription( "TT-Note: " + comment +"\n" +  des );
     }
     cal.addIncidence( to );
-    ICalFormat format;
+    ICalFormat format( false );
     file = dir +"/" +file +".ics";
     format.save( &cal, file );
     saveParents();
     
 }
 void Todo::saveParents()
 {
     if (!relatedTo() )
@@ -162,17 +163,17 @@ void Todo::saveParents()
     } else {
         saveTodo = true;
     }
     if ( saveTodo ) {
         CalendarLocal cal;
         cal.setLocalTime();
         Todo  * par = (Todo  *) to->clone();
         cal.addIncidence( par );
-        ICalFormat format;
+        ICalFormat format( false );
         format.save( &cal, file );
     } 
     to->saveParents();
 }
 
 int Todo::runTime()
 {
     if ( !mRunning )