2 files changed, 5 insertions, 4 deletions

diff --git a/libopie2/opiepim/ChangeLog b/libopie2/opiepim/ChangeLog
index 52b3f6b..a1b4db0 100644
--- a/libopie2/opiepim/ChangeLog
+++ b/libopie2/opiepim/ChangeLog
@@ -1,3 +1,5 @@
+2005-03.19 Stefan Eilers <stefan@eilers-online.net>
+        * Minor update for sorted(). Now ignoring any category search if "DoNotShowWithCategory" filter is activated.
 2005-03-18 Stefan Eilers <stefan@eilers-online.net>
         * Rewrote generic sorted filter and added filter for "DoNotShowWithCategory", needed by addressbook (other filters need to be added!)
 2005-01-16 Stefan Eilers <stefan@eilers-online.net>
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend.cpp b/libopie2/opiepim/backend/ocontactaccessbackend.cpp
index 6ac9934..e942905 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend.cpp
@@ -256,18 +256,17 @@ UIDArray OPimContactAccessBackend::sorted( const UIDArray& ar, bool asc, int sor
 
         contactPassed = true;
 
-        // Filter all Contacts which have any category
         if ( (filter & OPimContactAccess::DoNotShowWithCategory) ? true : false ){
                 if ( !contact.categories().isEmpty() )
                         continue;
-        }
+        } else {
 
+                if ( (filter  & OPimContactAccess::FilterCategory) ? true : false ){
         /* show category */
         /* -1 == unfiled */
         for ( uint cat_nu = 0; cat_nu < cat_count; ++cat_nu ) {
             cat = categories[cat_nu];
 
-            if ( (filter  & OPimContactAccess::FilterCategory) ? true : false ){
                     if ( cat == -1 ) { 
                             // We should search unfiled contacts. 
                             // Unfiled categories have no category set, thus continue if 
@@ -280,7 +279,7 @@ UIDArray OPimContactAccessBackend::sorted( const UIDArray& ar, bool asc, int sor
             }
 
         }
-
+        }
         /*
          * If none of the Categories matched
          * continue