[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim] kmail: Don't initialize the folder restrictor if we are in a search folder anyhow.
From:       Till Adam <adam () kde ! org>
Date:       2012-03-31 19:53:47
Message-ID: 20120331195347.27076A60C4 () git ! kde ! org
[Download RAW message or body]

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

Don't initialize the folder restrictor if we are in a search folder anyhow.

M  +1    -2    kmail/searchwindow.cpp

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

diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp
index 2787540..7189886 100644
--- a/kmail/searchwindow.cpp
+++ b/kmail/searchwindow.cpp
@@ -120,8 +120,6 @@ SearchWindow::SearchWindow( KMMainWidget *widget, const Akonadi::Collection &col
   mCbxFolders->setMustBeReadWrite( false );
   mCbxFolders->setNotAllowToCreateNewFolder( true );
 
-  mCbxFolders->setCollection( collection );
-
   mChkSubFolders = new QCheckBox( i18n( "I&nclude sub-folders" ), searchWidget );
   mChkSubFolders->setChecked( true );
 
@@ -144,6 +142,7 @@ SearchWindow::SearchWindow( KMMainWidget *widget, const Akonadi::Collection &col
   if ( !collection.hasAttribute<Akonadi::PersistentSearchAttribute>() ) {
     // it's not a search folder, make a new search
     mSearchPattern.append( SearchRule::createInstance( "Subject" ) );
+    mCbxFolders->setCollection( collection );
   } else {
     // it's a search folder
     if ( collection.hasAttribute<Akonadi::SearchDescriptionAttribute>() ) {

[prev in list] [next in list] [prev in thread] [next in thread]