summaryrefslogtreecommitdiff
path: root/libopie2/opiepim
authoreilers <eilers>2005-03-19 16:23:16 (UTC)
committer eilers <eilers>2005-03-19 16:23:16 (UTC)
commitea15abad0554edab0746f342fafddd461a0fb0eb (patch) (side-by-side diff)
treed645b3d8655bab11f9685f1989a854b21468e1d5 /libopie2/opiepim
parent34e42590a8ef21c1377f89c7b82f25bcf0aec3cb (diff)
downloadopie-ea15abad0554edab0746f342fafddd461a0fb0eb.zip
opie-ea15abad0554edab0746f342fafddd461a0fb0eb.tar.gz
opie-ea15abad0554edab0746f342fafddd461a0fb0eb.tar.bz2
Minor update for generic sorted(): It will now ignory any categories if filter "DoNotShowCategories" is used..
Diffstat (limited to 'libopie2/opiepim') (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opiepim/ChangeLog2
-rw-r--r--libopie2/opiepim/backend/ocontactaccessbackend.cpp7
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 +1,3 @@
+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>
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
@@ -258,3 +258,2 @@ UIDArray OPimContactAccessBackend::sorted( const UIDArray& ar, bool asc, int sor
- // Filter all Contacts which have any category
if ( (filter & OPimContactAccess::DoNotShowWithCategory) ? true : false ){
@@ -262,4 +261,5 @@ UIDArray OPimContactAccessBackend::sorted( const UIDArray& ar, bool asc, int sor
continue;
- }
+ } else {
+ if ( (filter & OPimContactAccess::FilterCategory) ? true : false ){
/* show category */
@@ -269,3 +269,2 @@ UIDArray OPimContactAccessBackend::sorted( const UIDArray& ar, bool asc, int sor
- if ( (filter & OPimContactAccess::FilterCategory) ? true : false ){
if ( cat == -1 ) {
@@ -282,3 +281,3 @@ UIDArray OPimContactAccessBackend::sorted( const UIDArray& ar, bool asc, int sor
}
-
+ }
/*