summaryrefslogtreecommitdiff
path: root/src/searches
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2022-05-21 19:44:03 +0200
committerJörg Frings-Fürst <debian@jff.email>2022-05-21 19:44:03 +0200
commita8c434f4f345295c14ec60106ca2693c25db1d83 (patch)
tree98c41a82a02589269d79423907e046397107e080 /src/searches
parent6dc4a14e122270c93a2940011ec451719aac22d2 (diff)
parent9e0516824a0f79514aca5d6dbb1aa21cd247ba05 (diff)
Update upstream source from tag 'upstream/0.30.16'
Update to upstream version '0.30.16' with Debian dir 8b17bfc99ecdf47f0885a81b749fceeaeb53601f
Diffstat (limited to 'src/searches')
-rw-r--r--src/searches/SavedSearchDialog.vala2
-rw-r--r--src/searches/SearchBoolean.vala18
2 files changed, 6 insertions, 14 deletions
diff --git a/src/searches/SavedSearchDialog.vala b/src/searches/SavedSearchDialog.vala
index f5558bf..526da35 100644
--- a/src/searches/SavedSearchDialog.vala
+++ b/src/searches/SavedSearchDialog.vala
@@ -79,9 +79,7 @@ public class SavedSearchDialog : Gtk.Dialog {
case SearchCondition.SearchType.ANY_TEXT:
case SearchCondition.SearchType.EVENT_NAME:
case SearchCondition.SearchType.FILE_NAME:
-#if ENABLE_FACES
case SearchCondition.SearchType.FACE:
-#endif
case SearchCondition.SearchType.TAG:
case SearchCondition.SearchType.COMMENT:
case SearchCondition.SearchType.TITLE:
diff --git a/src/searches/SearchBoolean.vala b/src/searches/SearchBoolean.vala
index 2be8302..5e69e57 100644
--- a/src/searches/SearchBoolean.vala
+++ b/src/searches/SearchBoolean.vala
@@ -52,9 +52,7 @@ public abstract class SearchCondition {
TAG,
EVENT_NAME,
FILE_NAME,
-#if ENABLE_FACES
FACE,
-#endif
MEDIA_TYPE,
FLAG_STATE,
MODIFIED_STATE,
@@ -65,9 +63,7 @@ public abstract class SearchCondition {
public static SearchType[] as_array() {
return { ANY_TEXT, TITLE, TAG, COMMENT, EVENT_NAME, FILE_NAME,
-#if ENABLE_FACES
FACE,
-#endif
MEDIA_TYPE, FLAG_STATE, MODIFIED_STATE, RATING, DATE };
}
@@ -98,10 +94,10 @@ public abstract class SearchCondition {
case SearchType.FILE_NAME:
return "FILE_NAME";
-#if ENABLE_FACES
+
case SearchType.FACE:
return "FACE";
-#endif
+
case SearchType.MEDIA_TYPE:
return "MEDIA_TYPE";
@@ -140,10 +136,10 @@ public abstract class SearchCondition {
else if (str == "FILE_NAME")
return SearchType.FILE_NAME;
-#if ENABLE_FACES
+
else if (str == "FACE")
return SearchType.FACE;
-#endif
+
else if (str == "MEDIA_TYPE")
return SearchType.MEDIA_TYPE;
@@ -182,10 +178,10 @@ public abstract class SearchCondition {
case SearchType.FILE_NAME:
return _("File name");
-#if ENABLE_FACES
+
case SearchType.FACE:
return _("Face");
-#endif
+
case SearchType.MEDIA_TYPE:
return _("Media type");
@@ -361,7 +357,6 @@ public class SearchConditionText : SearchCondition {
ret |= string_match(text, String.remove_diacritics(source.get_basename().down()));
}
-#if ENABLE_FACES
if (SearchType.ANY_TEXT == search_type || SearchType.FACE == search_type) {
Gee.List<Face>? face_list = Face.global.fetch_for_source(source);
if (null != face_list) {
@@ -372,7 +367,6 @@ public class SearchConditionText : SearchCondition {
ret |= string_match(text, null); // for IS_NOT_SET
}
}
-#endif
return (context == Context.DOES_NOT_CONTAIN) ? !ret : ret;
}