3 files changed, 20 insertions, 7 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index c4557ef..2aac9ff 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,4 +1,8 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
+********** VERSION 2.1.9 ************
+
+KO/Pi:
+Fixed some problems of the new search options in the search dialog.
 
 ********** VERSION 2.1.8 ************
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index 3e7b72c..9197850 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -76,5 +76,5 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
   QWidget *listWidget = new QWidget( mMiniSplitter );
 
-  QBoxLayout *listLayout = new QVBoxLayout (listWidget) ;
+  QVBoxLayout *listLayout = new QVBoxLayout (listWidget) ;
   //topLayout->addLayout( listLayout );
 
@@ -89,13 +89,16 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
            SLOT( slotOk() ) );
 
-  QHBox* searchBox = new QHBox ( listWidget );
-  mAddresseeEdit = new QLineEdit(  searchBox );
+  //QHBox* searchBox = new QHBox ( listWidget );
+  mAddresseeEdit = new QLineEdit(  listWidget );
   connect( mAddresseeEdit, SIGNAL( returnPressed() ),
            SLOT( loadAddressBook() ) );
   mAddresseeEdit->setFocus();
-  QPushButton *searchButton = new QPushButton( i18n("Search!"),  searchBox ); 
+  QPushButton *searchButton = new QPushButton( i18n("Search!"),  listWidget ); 
   connect ( searchButton, SIGNAL( clicked() ), SLOT( loadAddressBook() ) );
  
-  listLayout->addWidget( searchBox );
+  QHBoxLayout *searchLayout = new QHBoxLayout (listLayout) ;
+  searchLayout->addWidget( mAddresseeEdit );
+  searchLayout->addWidget( searchButton );
+  //listLayout->addWidget( searchBox );
 
   if ( mMultiple ) {
@@ -104,5 +107,5 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
       //topLayout->setSpacing( spacingHint() );
 
-    QVBox *selectedGroup = new QVBox( mMiniSplitter );
+     QVBox *selectedGroup = new QVBox( mMiniSplitter );
     new QLabel ( i18n("Selected:"), selectedGroup );
     //selectedLayout->addWidget( selectedGroup );
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index a8de297..0713980 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -562,5 +562,11 @@ void SearchDialog::search(const QRegExp &re)
         }
     }
-
+    if ( mMatchedEvents.count() + mMatchedJournals.count() + mMatchedTodos.count()  < 1 ) {
+        qDebug("count %d ", mMatchedEvents.count() + mMatchedJournals.count() + mMatchedTodos.count() );
+        if ( mRefineItems->isChecked() )
+            mRefineItems->setChecked( false );
+        else if ( mSubItems->isChecked() )
+            mSubItems->setChecked( false );
+    }
 }