2 files changed, 6 insertions, 4 deletions

diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 4366265..30efbf6 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -200,12 +200,13 @@ QString KODayMatrix::getWhatsThisText( QPoint p )
         }
         if ( !event->location().isEmpty() )
             mToolTipText += " (" + event->location() + ")";
         //qDebug("TTT: %s ", mToolTipText.latin1());
         mToolTip.append( deTag( mToolTipText ) );
     }
+    mToolTip.sort();
     if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) {
         QPtrList<Todo> todolist = mCalendar->todos(mDate);
         Todo  *todo;
         for(todo=todolist.first();todo != 0;todo=todolist.next()) { 
             QString mToolTipText;
             if ( !todo->doesFloat() )
@@ -215,13 +216,12 @@ QString KODayMatrix::getWhatsThisText( QPoint p )
                 mToolTipText += " (" + todo->location() + ")";
             mToolTipText = deTag( mToolTipText);
             mToolTipText = "<b>" + i18n("Todo: ") + "</b>"+ mToolTipText;
             mToolTip.append(  mToolTipText );
         }               
     }
-    mToolTip.sort();
     if (KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) {
         Journal *j = mCalendar->journal( mDate );
         if ( j ) {
             QString mToolTipText = j->description().left(100);
             if ( j->description().length() > 100 )
                 mToolTipText += " ...";
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index eed023c..3c0259f 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -184,13 +184,13 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
             if ( p->mToolBarUpF )
             tbd = Right;
             else
                 tbd = Left;
         }
         filterToolBar = new QPEToolBar ( this );
-        filterMenubar = new QMenuBar( filterToolBar );
+        filterMenubar = new QMenuBar( 0 );
         QFontMetrics fm ( filterMenubar->font() );
             
         filterPopupMenu = new QPopupMenu( this );
         filterMenubar->insertItem( i18n("No Filter"), filterPopupMenu,0  );
         QString addTest = "A";  
         filterMenubar->setMinimumWidth( fm.width( i18n("No Filter")+addTest ) );
@@ -1277,14 +1277,16 @@ void MainWindow::initActions()
     if (p-> mShowIconFilter) 
         configureToolBarMenu->setItemChecked( 7, true );
     if (p-> mShowIconOnetoolbar) 
         configureToolBarMenu->setItemChecked( 6, true );
    
 
-    if ( filterMenubar )
-         connect( mView->filterView(), SIGNAL( filterChanged() ), SLOT( updateFilterToolbar() ) );
+    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 );
     connect( configureAgendaMenu, SIGNAL( activated( int ) ),this,  SLOT(configureAgenda( int ) ) );
 }
 
 void MainWindow::exportToPhone( int mode )