Diffstat (limited to 'libopie2/opiepim/backend/ocontactaccessbackend.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | libopie2/opiepim/backend/ocontactaccessbackend.cpp | 7 |
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 | |||
256 | 256 | ||
257 | contactPassed = true; | 257 | contactPassed = true; |
258 | 258 | ||
259 | // Filter all Contacts which have any category | ||
260 | if ( (filter & OPimContactAccess::DoNotShowWithCategory) ? true : false ){ | 259 | if ( (filter & OPimContactAccess::DoNotShowWithCategory) ? true : false ){ |
261 | if ( !contact.categories().isEmpty() ) | 260 | if ( !contact.categories().isEmpty() ) |
262 | continue; | 261 | continue; |
263 | } | 262 | } else { |
264 | 263 | ||
264 | if ( (filter & OPimContactAccess::FilterCategory) ? true : false ){ | ||
265 | /* show category */ | 265 | /* show category */ |
266 | /* -1 == unfiled */ | 266 | /* -1 == unfiled */ |
267 | for ( uint cat_nu = 0; cat_nu < cat_count; ++cat_nu ) { | 267 | for ( uint cat_nu = 0; cat_nu < cat_count; ++cat_nu ) { |
268 | cat = categories[cat_nu]; | 268 | cat = categories[cat_nu]; |
269 | 269 | ||
270 | if ( (filter & OPimContactAccess::FilterCategory) ? true : false ){ | ||
271 | if ( cat == -1 ) { | 270 | if ( cat == -1 ) { |
272 | // We should search unfiled contacts. | 271 | // We should search unfiled contacts. |
273 | // Unfiled categories have no category set, thus continue if | 272 | // Unfiled categories have no category set, thus continue if |
@@ -280,7 +279,7 @@ UIDArray OPimContactAccessBackend::sorted( const UIDArray& ar, bool asc, int sor | |||
280 | } | 279 | } |
281 | 280 | ||
282 | } | 281 | } |
283 | 282 | } | |
284 | /* | 283 | /* |
285 | * If none of the Categories matched | 284 | * If none of the Categories matched |
286 | * continue | 285 | * continue |