summaryrefslogtreecommitdiff
path: root/src/SearchFilter.vala
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2022-05-21 19:44:47 +0200
committerJörg Frings-Fürst <debian@jff.email>2022-05-21 19:44:47 +0200
commitba553455d2d1dae08348020001844794502d0ac0 (patch)
tree98c41a82a02589269d79423907e046397107e080 /src/SearchFilter.vala
parent6dc4a14e122270c93a2940011ec451719aac22d2 (diff)
parenta8c434f4f345295c14ec60106ca2693c25db1d83 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/SearchFilter.vala')
-rw-r--r--src/SearchFilter.vala5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/SearchFilter.vala b/src/SearchFilter.vala
index bad6a73..ad8b7ec 100644
--- a/src/SearchFilter.vala
+++ b/src/SearchFilter.vala
@@ -223,9 +223,7 @@ public abstract class DefaultSearchViewFilter : SearchViewFilter {
Gee.List<Tag>? tags = Tag.global.fetch_for_source(source);
int tags_size = (tags != null) ? tags.size : 0;
-#if ENABLE_FACES
Gee.List<Face>? faces = Face.global.fetch_for_source(source);
-#endif
foreach (unowned string word in get_search_filter_words()) {
if (media_keywords != null && media_keywords.contains(word))
@@ -249,7 +247,6 @@ public abstract class DefaultSearchViewFilter : SearchViewFilter {
continue;
}
-#if ENABLE_FACES
if (faces != null) {
bool found = false;
foreach (Face f in faces) {
@@ -264,7 +261,7 @@ public abstract class DefaultSearchViewFilter : SearchViewFilter {
if (found)
continue;
}
-#endif
+
// failed all tests (this even works if none of the Indexables have strings,
// as they fail the implicit AND test)
return false;