summaryrefslogtreecommitdiff
path: root/libopie2/opiepim/backend/ocontactaccessbackend.cpp
Unidiff
Diffstat (limited to 'libopie2/opiepim/backend/ocontactaccessbackend.cpp') (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opiepim/backend/ocontactaccessbackend.cpp7
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
@@ -253,37 +253,36 @@ UIDArray OPimContactAccessBackend::sorted( const UIDArray& ar, bool asc, int sor
253 OPimContact contact = find( ar[i], ar, i, Frontend::Forward ); 253 OPimContact contact = find( ar[i], ar, i, Frontend::Forward );
254 if ( contact.isEmpty() ) 254 if ( contact.isEmpty() )
255 continue; 255 continue;
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
274 // this contact has no empty category. 273 // this contact has no empty category.
275 if( !contact.categories().isEmpty() ) 274 if( !contact.categories().isEmpty() )
276 contactPassed = false; 275 contactPassed = false;
277 } else if ( cat != 0 ) 276 } else if ( cat != 0 )
278 if ( !contact.categories().contains( cat ) ) 277 if ( !contact.categories().contains( cat ) )
279 contactPassed = false; 278 contactPassed = false;
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
287 */ 286 */
288 if ( !contactPassed ) 287 if ( !contactPassed )
289 continue; 288 continue;