Merge branch 'feature/upstream' into develop

1 files changed, 0 insertions, 9 deletions

diff --git a/src/library/LibraryWindow.vala b/src/library/LibraryWindow.vala
index 99a1c67..3aa397e 100644
--- a/src/library/LibraryWindow.vala
+++ b/src/library/LibraryWindow.vala
@@ -48,9 +48,7 @@ public class LibraryWindow : AppWindow {
         EVENTS,
         IMPORT_ROLL,
         FOLDERS,
-#if ENABLE_FACES   
         FACES,
-#endif
         TAGS
     }
     
@@ -115,9 +113,7 @@ public class LibraryWindow : AppWindow {
     private Library.Branch library_branch = new Library.Branch();
     private Tags.Branch tags_branch = new Tags.Branch();
     private Folders.Branch folders_branch = new Folders.Branch();
-#if ENABLE_FACES   
     private Faces.Branch faces_branch = new Faces.Branch();
-#endif
     private Events.Branch events_branch = new Events.Branch();
     private Camera.Branch camera_branch = new Camera.Branch();
     private Searches.Branch saved_search_branch = new Searches.Branch();
@@ -176,10 +172,7 @@ public class LibraryWindow : AppWindow {
         sidebar_tree.graft(library_branch, SidebarRootPosition.LIBRARY);
         sidebar_tree.graft(tags_branch, SidebarRootPosition.TAGS);
         sidebar_tree.graft(folders_branch, SidebarRootPosition.FOLDERS);
-#if ENABLE_FACES   
         sidebar_tree.graft(faces_branch, SidebarRootPosition.FACES);
-#endif
-
         sidebar_tree.graft(events_branch, SidebarRootPosition.EVENTS);
         sidebar_tree.graft(camera_branch, SidebarRootPosition.CAMERAS);
         sidebar_tree.graft(saved_search_branch, SidebarRootPosition.SAVED_SEARCH);
@@ -414,7 +407,6 @@ public class LibraryWindow : AppWindow {
             debug("No search entry found for rename");
     }
     
-#if ENABLE_FACES
     public void rename_face_in_sidebar(Face face) {
         Faces.SidebarEntry? entry = faces_branch.get_entry_for_face(face);
         if (entry != null)
@@ -422,7 +414,6 @@ public class LibraryWindow : AppWindow {
         else
             assert_not_reached();
     }
-#endif
     
     protected override void on_quit() {
         Config.Facade.get_instance().set_library_window_state(maximized, dimensions);