Git commit f5b7b46fa4b182cb4e25a7f7cc2dc1f9901df4c6 by Till Adam.
Committed on 31/03/2012 at 20:41.
Pushed by tilladam into branch 'master'.

Reset the restriction for collection(s) to search properly.

M  +7    -4    kmail/searchwindow.cpp

http://commits.kde.org/kdepim/f5b7b46fa4b182cb4e25a7f7cc2dc1f9901df4c6

diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp
index 9d7125c..2787540 100644
--- a/kmail/searchwindow.cpp
+++ b/kmail/searchwindow.cpp
@@ -485,9 +485,8 @@ void SearchWindow::slotSearch()
     }
   }
 =

-
-  =

   mPatternEdit->updateSearchPattern();
+
   SearchPattern searchPattern( mSearchPattern );
   searchPattern.purify();
   enableGUI();
@@ -554,8 +553,12 @@ void SearchWindow::searchDone( KJob* job )
       Q_ASSERT( !search.isEmpty() );
       Akonadi::SearchDescriptionAttribute *searchDescription =3D mFolder.a=
ttribute<Akonadi::SearchDescriptionAttribute>( Akonadi::Entity::AddIfMissin=
g );
       searchDescription->setDescription( search );
-      const Akonadi::Collection collection =3D mCbxFolders->collection();
-      searchDescription->setBaseCollection( collection );
+      if ( !mChkbxAllFolders->isChecked() ) {
+        const Akonadi::Collection collection =3D mCbxFolders->collection();
+        searchDescription->setBaseCollection( collection );
+      } else {
+        searchDescription->setBaseCollection( Akonadi::Collection() );
+      }
       searchDescription->setRecursive( mChkSubFolders->isChecked() );
       new Akonadi::CollectionModifyJob( mFolder, this );
       mSearchJob =3D 0;