Minor update for generic sorted(): It will now ignory any categories if filter "DoNotShowCategories" is used..

1 files changed, 3 insertions, 4 deletions

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