diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2022-05-21 19:44:47 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2022-05-21 19:44:47 +0200 |
| commit | ba553455d2d1dae08348020001844794502d0ac0 (patch) | |
| tree | 98c41a82a02589269d79423907e046397107e080 /src/AppDirs.vala | |
| parent | 6dc4a14e122270c93a2940011ec451719aac22d2 (diff) | |
| parent | a8c434f4f345295c14ec60106ca2693c25db1d83 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/AppDirs.vala')
| -rw-r--r-- | src/AppDirs.vala | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/AppDirs.vala b/src/AppDirs.vala index 74b045f..6c4541c 100644 --- a/src/AppDirs.vala +++ b/src/AppDirs.vala @@ -258,14 +258,12 @@ class AppDirs { return subdir; } -#if ENABLE_FACES public static File get_resources_dir() { File? install_dir = get_install_dir(); return (install_dir != null) ? install_dir.get_child("share").get_child("shotwell") : get_exec_dir(); } -#endif public static File get_lib_dir() { File? install_dir = get_install_dir(); @@ -329,7 +327,6 @@ class AppDirs { return f; } -#if ENABLE_FACES public static File get_facedetect_bin() { const string filename = "shotwell-facedetect"; File f = AppDirs.get_libexec_dir().get_parent().get_child("facedetect").get_child (filename); @@ -346,7 +343,6 @@ class AppDirs { } return get_resources_dir().get_child("facedetect-haarcascade.xml"); } -#endif } |