2 files changed, 5 insertions, 3 deletions

diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 4366265..30efbf6 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -204,4 +204,5 @@ QString KODayMatrix::getWhatsThisText( QPoint p )
         mToolTip.append( deTag( mToolTipText ) );
     }
+    mToolTip.sort();
     if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) {
         QPtrList<Todo> todolist = mCalendar->todos(mDate);
@@ -219,5 +220,4 @@ QString KODayMatrix::getWhatsThisText( QPoint p )
         }               
     }
-    mToolTip.sort();
     if (KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) {
         Journal *j = mCalendar->journal( mDate );
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index eed023c..3c0259f 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -188,5 +188,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
         }
         filterToolBar = new QPEToolBar ( this );
-        filterMenubar = new QMenuBar( filterToolBar );
+        filterMenubar = new QMenuBar( 0 );
         QFontMetrics fm ( filterMenubar->font() );
             
@@ -1281,6 +1281,8 @@ void MainWindow::initActions()
    
 
-    if ( filterMenubar )
+    if ( filterMenubar ) {
+        filterMenubar->reparent(filterToolBar,0,QPoint(0,0) );
          connect( mView->filterView(), SIGNAL( filterChanged() ), SLOT( updateFilterToolbar() ) );
+    }
     connect( configureToolBarMenu, SIGNAL( activated( int ) ),this,  SLOT(configureToolBar( int ) ) );
     configureAgenda( p->mHourSize );