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/main.vala | |
| parent | 6dc4a14e122270c93a2940011ec451719aac22d2 (diff) | |
| parent | a8c434f4f345295c14ec60106ca2693c25db1d83 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/main.vala')
| -rw-r--r-- | src/main.vala | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/main.vala b/src/main.vala index a971f15..d0cb246 100644 --- a/src/main.vala +++ b/src/main.vala @@ -99,10 +99,8 @@ void library_exec(string[] mounts) { + EventTable.get_instance().get_row_count() + TagTable.get_instance().get_row_count() + VideoTable.get_instance().get_row_count() -#if ENABLE_FACES + FaceTable.get_instance().get_row_count() + FaceLocationTable.get_instance().get_row_count() -#endif + Upgrades.get_instance().get_step_count(); if (grand_total > 5000) { progress_dialog = new ProgressDialog(null, _("Loading Shotwell")); @@ -146,14 +144,12 @@ void library_exec(string[] mounts) { if (aggregate_monitor != null) aggregate_monitor.next_step("Tag.init"); Tag.init(monitor); -#if ENABLE_FACES if (aggregate_monitor != null) aggregate_monitor.next_step("FaceLocation.init"); FaceLocation.init(monitor); if (aggregate_monitor != null) aggregate_monitor.next_step("Face.init"); Face.init(monitor); -#endif MetadataWriter.init(); DesktopIntegration.init(); @@ -219,10 +215,8 @@ void library_exec(string[] mounts) { Tombstone.terminate(); ThumbnailCache.terminate(); Video.terminate(); -#if ENABLE_FACES Face.terminate(); FaceLocation.terminate(); -#endif Library.app_terminate(); } |