4 files changed, 8 insertions, 10 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 96fb5ca..db33017 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -3691,3 +3691,3 @@ void CalendarView::toggleExpand()
     //   }
-
+    //qDebug(" CalendarView::toggleExpand()");
     globalFlagBlockAgenda = 1;
diff --git a/korganizer/datenavigator.cpp b/korganizer/datenavigator.cpp
index 3156b2b..d2824de 100644
--- a/korganizer/datenavigator.cpp
+++ b/korganizer/datenavigator.cpp
@@ -212,4 +212,3 @@ void DateNavigator::selectToday()
   int dateCount = mSelectedDates.count();
-
-  if ( dateCount == 5 ) selectWorkWeek( d );
+  if ( dateCount == 5 && d.dayOfWeek() < 6 ) selectWorkWeek( d );
   else if ( dateCount == 7 ) selectWeek( d );
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 10e4f1d..4cefb26 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -969,3 +969,3 @@ void KOMonthView::updateView()
     // qDebug("---------------------------------------------------------------------+ ");
-    setFocus();
+    mCells[0]->setFocus();
 }
@@ -1133,4 +1133,4 @@ void KOMonthView::keyPressEvent ( QKeyEvent * e )
 {
+    //qDebug("KOMonthView::keyPressEvent ");
     switch(e->key()) {
-        break;
     case Key_Up: 
@@ -1138,3 +1138,3 @@ void KOMonthView::keyPressEvent ( QKeyEvent * e )
             emit prevMonth();
-            setFocus();
+            mCells[0]->setFocus();
         }
@@ -1145,3 +1145,4 @@ void KOMonthView::keyPressEvent ( QKeyEvent * e )
             emit nextMonth();
-            setFocus();
+            mCells[0]->setFocus();
+           
         }
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 6da4799..4c03f9a 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -104,3 +104,3 @@ void KOViewManager::showDateView( int view, QDate date)
 
-    qDebug("date %d %s", view, date.toString().latin1());
+    //qDebug("date %d %s", view, date.toString().latin1());
 #if 0
@@ -194,3 +194,2 @@ void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen )
         mCurrentView = view;
-        
         // bool full = fullScreen;
@@ -212,3 +211,2 @@ void KOViewManager::raiseCurrentView( bool fullScreen )
 {
-    //qDebug("raiseCurrentView ");
     mCurrentAgendaView = 0;