2 files changed, 10 insertions, 5 deletions

diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 4aeb20c..8d06040 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -69,32 +69,33 @@ protected:
     virtual QString text( const QPoint& p)
     {
         return _wid->getWhatsThisText(p) ;
     };
 private:
     KNoScrollListBox* _wid;
   
 };
  
 
 KNoScrollListBox::KNoScrollListBox(QWidget *parent,const char *name)
     : QListBox(parent, name, WRepaintNoErase)
 {
 #ifndef DESKTOP_VERSION
     QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold );
 #endif 
+    mBlockDeselect = false;
     mWT = new KNOWhatsThis(this);
     resetOnFocusIn = true;
     setVScrollBarMode(QScrollView::AlwaysOff);
     setHScrollBarMode(QScrollView::AlwaysOff);
 }
 KNoScrollListBox::~KNoScrollListBox()
 {
 #if QT_VERSION >= 0x030000
 
 #else
     delete mWT;
 #endif 
 }
 
 
 void KNoScrollListBox::focusInEvent ( QFocusEvent * e )
@@ -122,40 +123,44 @@ void KNoScrollListBox::focusInEvent ( QFocusEvent * e )
                     setVScrollBarMode(QScrollView::Auto);
                 if ( ihei *3 > height() ) {
                     setHScrollBarMode(QScrollView::AlwaysOff);
                 }
                 else {
                     setHScrollBarMode(QScrollView::Auto);
                 }
             } else {
                 setVScrollBarMode(QScrollView::Auto);
                 setHScrollBarMode(QScrollView::Auto);
             }
         } 
     }
 }
 void KNoScrollListBox::focusOutEvent ( QFocusEvent * e )
 {
+  if ( ! mBlockDeselect ) {
     int i =  currentItem ();
     if ( i >= 0 ) {
-        setSelected ( i, false ); 
+      setSelected ( i, false ); 
     }
     QListBox::focusOutEvent ( e ); 
+  }
     setVScrollBarMode(QScrollView::AlwaysOff);
     setHScrollBarMode(QScrollView::AlwaysOff);
-    emit highlightIncidence( 0, (MonthViewCell*)this, 0 );
+    if ( ! mBlockDeselect )
+      emit highlightIncidence( 0, (MonthViewCell*)this, 0 );
+    mBlockDeselect = false;
 }
 
 QString KNoScrollListBox::getWhatsThisText(QPoint p) 
 {
     QListBoxItem* item = itemAt ( p );
     if ( ! item ) {
         return i18n("Click in the cell\nto add an event!");
     }
     return KIncidenceFormatter::instance()->getFormattedText(((MonthViewItem*) item)->incidence(),
                                                                   KOPrefs::instance()->mWTshowDetails,
                                                                   KOPrefs::instance()->mWTshowCreated,
                                                                   KOPrefs::instance()->mWTshowChanged);
 }
 void KNoScrollListBox::keyPressEvent(QKeyEvent *e)
 {
     //qDebug("KNoScrollListBox::keyPressEvent ");
@@ -1097,35 +1102,34 @@ void MonthViewCell::cellClicked( QListBoxItem *item )
     }
 
 }
 
 void MonthViewCell::contextMenu( QListBoxItem *item )
 {
     mMonthView->setPopupCell( this );
     if ( !item )  {
         mMonthView->showContextMenu( 0 );
         return;
     }
     //selection( item );
     //qApp->processEvents();
     MonthViewItem *eventItem = static_cast<MonthViewItem *>( item );
     Incidence *incidence = eventItem->incidence();
     if ( incidence ) {
+      mBlockDeselect = true;
         mMonthView->showContextMenu( incidence );
-        selection( item );
-        doHighLight( incidence );
     }
 }
 
 void MonthViewCell::selection( QListBoxItem *item )
 {
     if ( !item ) {
         emit highlightIncidence( 0 , this, 0 );
         return;
     }
     MonthViewItem * it = (static_cast<MonthViewItem *>( item ));
     emit highlightIncidence( it->incidence(), this, it->multiDay() );
     mMonthView->setSelectedCell( this );
 }
 
 void  MonthViewCell::deHighLight()
 {
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index 61a141a..1a9d16d 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -74,33 +74,34 @@ private slots :
 
 class KNoScrollListBox: public QListBox
 {
     Q_OBJECT
   public:
     KNoScrollListBox(QWidget *parent=0, const char *name=0);
     ~KNoScrollListBox();
     QString getWhatsThisText(QPoint p) ;
 
   signals:
     void shiftDown();
     void shiftUp();
     void rightClick();
     void nextCell();
     void prevCell();
     void highlightIncidence( Incidence * , MonthViewCell*, int );
-
+ protected:
+    bool mBlockDeselect;
    protected slots:
     void oneDown();
     void keyPressEvent(QKeyEvent *);
     void keyReleaseEvent(QKeyEvent *);
     void mousePressEvent(QMouseEvent *); 
     void focusInEvent ( QFocusEvent * );
     void focusOutEvent ( QFocusEvent * ); 
 
  private:
     bool resetOnFocusIn;
     KNOWhatsThis * mWT;
 };
 
 
 class MonthViewItem: public QListBoxItem
 {