Merge branch 'release/debian/0.30.16-1'debian/0.30.16-1

1 files changed, 6 insertions, 12 deletions

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;
     }