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

1 files changed, 21 insertions, 2 deletions

diff --git a/src/main.vala b/src/main.vala
index d09c827..8313ba1 100644
--- a/src/main.vala
+++ b/src/main.vala
@@ -99,6 +99,10 @@ 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"));
@@ -142,6 +146,14 @@ 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();
@@ -207,6 +219,11 @@ void library_exec(string[] mounts) {
     Tombstone.terminate();
     ThumbnailCache.terminate();
     Video.terminate();
+#if ENABLE_FACES       
+    Face.terminate();
+    FaceLocation.terminate();
+#endif
+
     Library.app_terminate();
 }
 
@@ -355,13 +372,16 @@ void main(string[] args) {
     try {
         Gtk.init_with_args(ref args, _("[FILE]"), CommandlineOptions.get_options(),
             Resources.APP_GETTEXT_PACKAGE);
+
+        var use_dark = Config.Facade.get_instance().get_gtk_theme_variant();
+        Gtk.Settings.get_default().gtk_application_prefer_dark_theme = use_dark;
     } catch (Error e) {
         print(e.message + "\n");
         print(_("Run “%s --help” to see a full list of available command line options.\n"), args[0]);
         AppDirs.terminate();
         return;
     }
-    
+
     if (CommandlineOptions.show_version) {
         if (Resources.GIT_VERSION != null)
             print("%s %s (%s)\n", Resources.APP_TITLE, Resources.APP_VERSION, Resources.GIT_VERSION);
@@ -403,7 +423,6 @@ void main(string[] args) {
         message("Shotwell %s %s",
             is_string_empty(filename) ? Resources.APP_LIBRARY_ROLE : Resources.APP_DIRECT_ROLE,
             Resources.APP_VERSION);
-
     debug ("Shotwell is running in timezone %s", new
            DateTime.now_local().get_timezone_abbreviation ());