3 files changed, 6 insertions, 5 deletions

diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index 5941337..d4173e8 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -155,17 +155,18 @@ void DateNavigatorContainer::resizeEvent( QResizeEvent * e )
 {
 #if 0
   kdDebug(5850) << "DateNavigatorContainer::resizeEvent()" << endl;
   kdDebug(5850) << "  CURRENT SIZE: " << size() << endl;
   kdDebug(5850) << "  MINIMUM SIZEHINT: " << minimumSizeHint() << endl;
   kdDebug(5850) << "  SIZEHINT: " << sizeHint() << endl;
   kdDebug(5850) << "  MINIMUM SIZE: " << minimumSize() << endl;
 #endif
-  QSize minSize = mNavigatorView->sizeHintTwoButtons();
+  //QSize minSize = mNavigatorView->sizeHintTwoButtons();
+  QSize minSize = mNavigatorView->yourSizeHint();
 
 //  kdDebug(5850) << "  NAVIGATORVIEW minimumSizeHint: " << minSize << endl;
 
   int verticalCount = size().height() / minSize.height();
   int horizontalCount = size().width() / minSize.width();
   //qDebug(" wattdatt %d new %d %d ", size().width() ,e->size().width() , minSize.width() );  
   //qDebug("COUNT %d %d %d %d ", verticalCount, horizontalCount , mVerticalCount, mHorizontalCount );
   bool fontchange = false;  
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index a5dbc5d..4b50b5a 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -110,17 +110,17 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name )
   connect( daymatrix, SIGNAL( eventDropped( Event * ) ),
            SIGNAL( eventDropped( Event * ) ) );
 
   topLayout->addMultiCellWidget(daymatrix,2,7,1,7);
 
   // read settings from configuration file.
   updateConfig();
   enableRollover(FollowMonth);
-  mySizeHint = sizeHint();
+  mySizeHint = sizeHintTwoButtons();
   mFontChanged = false;
 }
 void KDateNavigator::changeFont ( QFont fo ) 
 {
         setFont( fo );
         mNavigatorBar->resetFont( fo );
 }
 QFont KDateNavigator::yourFontHint( QSize si , bool *b)
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 582b2ef..9baff20 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -440,27 +440,27 @@ void KODayMatrix::updateEvents()
     }
     events[ i ] = numEvents;
   }
 }
 
 const QDate& KODayMatrix::getDate(int offset)
 {
   if (offset < 0 || offset > NUMDAYS-1) {
-      qDebug("Wrong offset2 ");
+      qDebug("Wrong offset2 %d", offset);
     return days[0];
   }
   return days[offset];
 }
 
 QString KODayMatrix::getHolidayLabel(int offset)
 {
   if (offset < 0 || offset > NUMDAYS-1) {
-      qDebug("Wrong offset1 ");
-    return 0;
+      qDebug("Wrong offset1 %d", offset);
+      return QString();
   }
   return mHolidays[offset];
 }
 
 int KODayMatrix::getDayIndexFrom(int x, int y)
 { 
   int colModulo = (width()-2)  % 7;
   int rowModulo = (height()-2)  % 6;