[shotwell/wip/gtk4: 42/45] Add back folders branch
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [shotwell/wip/gtk4: 42/45] Add back folders branch
- Date: Wed, 13 Apr 2022 18:21:22 +0000 (UTC)
commit 327f1e832ab6262b586d5572c938efd2d111090f
Author: Jens Georg <mail jensge org>
Date: Mon Apr 11 21:32:39 2022 +0200
Add back folders branch
src/library/LibraryWindow.vala | 4 +---
src/meson.build | 1 +
2 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/src/library/LibraryWindow.vala b/src/library/LibraryWindow.vala
index ebcd828c..66a9537d 100644
--- a/src/library/LibraryWindow.vala
+++ b/src/library/LibraryWindow.vala
@@ -111,8 +111,8 @@ public class LibraryWindow : AppWindow {
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();
-#if DOES_NOT_WORK_WITH_GTK4
private Folders.Branch folders_branch = new Folders.Branch();
+#if DOES_NOT_WORK_WITH_GTK4
private Faces.Branch faces_branch = new Faces.Branch();
private ImportRoll.Branch import_roll_branch = new ImportRoll.Branch();
@@ -161,11 +161,9 @@ public class LibraryWindow : AppWindow {
sidebar_tree.graft(library_branch, SidebarRootPosition.LIBRARY);
sidebar_tree.graft(tags_branch, SidebarRootPosition.TAGS);
- #if 0
sidebar_tree.graft(folders_branch, SidebarRootPosition.FOLDERS);
#if ENABLE_FACES
sidebar_tree.graft(faces_branch, SidebarRootPosition.FACES);
-#endif
#endif
sidebar_tree.graft(events_branch, SidebarRootPosition.EVENTS);
diff --git a/src/meson.build b/src/meson.build
index dda8b702..de2055b8 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -153,6 +153,7 @@ executable(
'config/ConfigurationInterfaces.vala',
'config/GSettingsEngine.vala',
'folders/Folders.vala',
+ 'folders/FoldersBranch.vala',
'folders/FoldersPage.vala',
'main.vala',
'AppWindow.vala',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]