22 files changed, 347 insertions, 237 deletions

diff --git a/src/.unitize/_CameraInternals.c b/src/.unitize/_CameraInternals.c
index b1bd5f0..e3fa04d 100644
--- a/src/.unitize/_CameraInternals.c
+++ b/src/.unitize/_CameraInternals.c
@@ -1,4 +1,4 @@
-/* _CameraInternals.c generated by valac 0.36.6, the Vala compiler
+/* _CameraInternals.c generated by valac 0.40.4, the Vala compiler
  * generated from _CameraInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -9,6 +9,7 @@
  * Auto-generated file.  Do not modify!
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 
@@ -27,7 +28,9 @@ void unit_terminate_entry (void);
 void sidebar_terminate_entry (void);
 
 
-void camera_init_entry (GError** error) {
+void
+camera_init_entry (GError** error)
+{
 	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
@@ -38,7 +41,7 @@ void camera_init_entry (GError** error) {
 	if (_tmp0_ != 0) {
 #line 15 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
 		return;
-#line 42 "_CameraInternals.c"
+#line 45 "_CameraInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
 	unit_init_entry (&_inner_error_);
@@ -48,7 +51,7 @@ void camera_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
 		return;
-#line 52 "_CameraInternals.c"
+#line 55 "_CameraInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
 	sidebar_init_entry (&_inner_error_);
@@ -58,7 +61,7 @@ void camera_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
 		return;
-#line 62 "_CameraInternals.c"
+#line 65 "_CameraInternals.c"
 	}
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
 	camera_init (&_inner_error_);
@@ -68,12 +71,14 @@ void camera_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
 		return;
-#line 72 "_CameraInternals.c"
+#line 75 "_CameraInternals.c"
 	}
 }
 
 
-void camera_terminate_entry (void) {
+void
+camera_terminate_entry (void)
+{
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
@@ -82,7 +87,7 @@ void camera_terminate_entry (void) {
 	if (_tmp1_ == 0) {
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
 		_tmp0_ = TRUE;
-#line 86 "_CameraInternals.c"
+#line 91 "_CameraInternals.c"
 	} else {
 		gint _tmp2_;
 		gint _tmp3_;
@@ -94,13 +99,13 @@ void camera_terminate_entry (void) {
 		_tmp3_ = camera__unit_init_count;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
 		_tmp0_ = _tmp3_ != 0;
-#line 98 "_CameraInternals.c"
+#line 103 "_CameraInternals.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
 	if (_tmp0_) {
 #line 24 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
 		return;
-#line 104 "_CameraInternals.c"
+#line 109 "_CameraInternals.c"
 	}
 #line 26 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
 	camera_terminate ();
@@ -108,7 +113,7 @@ void camera_terminate_entry (void) {
 	unit_terminate_entry ();
 #line 28 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
 	sidebar_terminate_entry ();
-#line 112 "_CameraInternals.c"
+#line 117 "_CameraInternals.c"
 }
 
 
diff --git a/src/.unitize/_ConfigInternals.c b/src/.unitize/_ConfigInternals.c
index 0048c54..a9c0493 100644
--- a/src/.unitize/_ConfigInternals.c
+++ b/src/.unitize/_ConfigInternals.c
@@ -1,4 +1,4 @@
-/* _ConfigInternals.c generated by valac 0.36.6, the Vala compiler
+/* _ConfigInternals.c generated by valac 0.40.4, the Vala compiler
  * generated from _ConfigInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -9,6 +9,7 @@
  * Auto-generated file.  Do not modify!
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 
@@ -25,7 +26,9 @@ void config_terminate (void);
 void unit_terminate_entry (void);
 
 
-void config_init_entry (GError** error) {
+void
+config_init_entry (GError** error)
+{
 	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
@@ -36,7 +39,7 @@ void config_init_entry (GError** error) {
 	if (_tmp0_ != 0) {
 #line 15 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
 		return;
-#line 40 "_ConfigInternals.c"
+#line 43 "_ConfigInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
 	unit_init_entry (&_inner_error_);
@@ -46,7 +49,7 @@ void config_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
 		return;
-#line 50 "_ConfigInternals.c"
+#line 53 "_ConfigInternals.c"
 	}
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
 	config_init (&_inner_error_);
@@ -56,12 +59,14 @@ void config_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
 		return;
-#line 60 "_ConfigInternals.c"
+#line 63 "_ConfigInternals.c"
 	}
 }
 
 
-void config_terminate_entry (void) {
+void
+config_terminate_entry (void)
+{
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
@@ -70,7 +75,7 @@ void config_terminate_entry (void) {
 	if (_tmp1_ == 0) {
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
 		_tmp0_ = TRUE;
-#line 74 "_ConfigInternals.c"
+#line 79 "_ConfigInternals.c"
 	} else {
 		gint _tmp2_;
 		gint _tmp3_;
@@ -82,19 +87,19 @@ void config_terminate_entry (void) {
 		_tmp3_ = config__unit_init_count;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
 		_tmp0_ = _tmp3_ != 0;
-#line 86 "_ConfigInternals.c"
+#line 91 "_ConfigInternals.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
 	if (_tmp0_) {
 #line 24 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
 		return;
-#line 92 "_ConfigInternals.c"
+#line 97 "_ConfigInternals.c"
 	}
 #line 26 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
 	config_terminate ();
 #line 28 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
 	unit_terminate_entry ();
-#line 98 "_ConfigInternals.c"
+#line 103 "_ConfigInternals.c"
 }
 
 
diff --git a/src/.unitize/_CoreInternals.c b/src/.unitize/_CoreInternals.c
index 785036d..c53d97d 100644
--- a/src/.unitize/_CoreInternals.c
+++ b/src/.unitize/_CoreInternals.c
@@ -1,4 +1,4 @@
-/* _CoreInternals.c generated by valac 0.36.6, the Vala compiler
+/* _CoreInternals.c generated by valac 0.40.4, the Vala compiler
  * generated from _CoreInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -9,6 +9,7 @@
  * Auto-generated file.  Do not modify!
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 
@@ -25,7 +26,9 @@ void core_terminate (void);
 void unit_terminate_entry (void);
 
 
-void core_init_entry (GError** error) {
+void
+core_init_entry (GError** error)
+{
 	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
@@ -36,7 +39,7 @@ void core_init_entry (GError** error) {
 	if (_tmp0_ != 0) {
 #line 15 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
 		return;
-#line 40 "_CoreInternals.c"
+#line 43 "_CoreInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
 	unit_init_entry (&_inner_error_);
@@ -46,7 +49,7 @@ void core_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
 		return;
-#line 50 "_CoreInternals.c"
+#line 53 "_CoreInternals.c"
 	}
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
 	core_init (&_inner_error_);
@@ -56,12 +59,14 @@ void core_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
 		return;
-#line 60 "_CoreInternals.c"
+#line 63 "_CoreInternals.c"
 	}
 }
 
 
-void core_terminate_entry (void) {
+void
+core_terminate_entry (void)
+{
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
@@ -70,7 +75,7 @@ void core_terminate_entry (void) {
 	if (_tmp1_ == 0) {
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
 		_tmp0_ = TRUE;
-#line 74 "_CoreInternals.c"
+#line 79 "_CoreInternals.c"
 	} else {
 		gint _tmp2_;
 		gint _tmp3_;
@@ -82,19 +87,19 @@ void core_terminate_entry (void) {
 		_tmp3_ = core__unit_init_count;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
 		_tmp0_ = _tmp3_ != 0;
-#line 86 "_CoreInternals.c"
+#line 91 "_CoreInternals.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
 	if (_tmp0_) {
 #line 24 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
 		return;
-#line 92 "_CoreInternals.c"
+#line 97 "_CoreInternals.c"
 	}
 #line 26 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
 	core_terminate ();
 #line 28 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
 	unit_terminate_entry ();
-#line 98 "_CoreInternals.c"
+#line 103 "_CoreInternals.c"
 }
 
 
diff --git a/src/.unitize/_DataImportsInternals.c b/src/.unitize/_DataImportsInternals.c
index 6f25bbf..e99bde1 100644
--- a/src/.unitize/_DataImportsInternals.c
+++ b/src/.unitize/_DataImportsInternals.c
@@ -1,4 +1,4 @@
-/* _DataImportsInternals.c generated by valac 0.36.6, the Vala compiler
+/* _DataImportsInternals.c generated by valac 0.40.4, the Vala compiler
  * generated from _DataImportsInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -9,6 +9,7 @@
  * Auto-generated file.  Do not modify!
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 
@@ -25,7 +26,9 @@ void data_imports_terminate (void);
 void unit_terminate_entry (void);
 
 
-void data_imports_init_entry (GError** error) {
+void
+data_imports_init_entry (GError** error)
+{
 	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
@@ -36,7 +39,7 @@ void data_imports_init_entry (GError** error) {
 	if (_tmp0_ != 0) {
 #line 15 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
 		return;
-#line 40 "_DataImportsInternals.c"
+#line 43 "_DataImportsInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
 	unit_init_entry (&_inner_error_);
@@ -46,7 +49,7 @@ void data_imports_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
 		return;
-#line 50 "_DataImportsInternals.c"
+#line 53 "_DataImportsInternals.c"
 	}
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
 	data_imports_init (&_inner_error_);
@@ -56,12 +59,14 @@ void data_imports_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
 		return;
-#line 60 "_DataImportsInternals.c"
+#line 63 "_DataImportsInternals.c"
 	}
 }
 
 
-void data_imports_terminate_entry (void) {
+void
+data_imports_terminate_entry (void)
+{
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
@@ -70,7 +75,7 @@ void data_imports_terminate_entry (void) {
 	if (_tmp1_ == 0) {
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
 		_tmp0_ = TRUE;
-#line 74 "_DataImportsInternals.c"
+#line 79 "_DataImportsInternals.c"
 	} else {
 		gint _tmp2_;
 		gint _tmp3_;
@@ -82,19 +87,19 @@ void data_imports_terminate_entry (void) {
 		_tmp3_ = data_imports__unit_init_count;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
 		_tmp0_ = _tmp3_ != 0;
-#line 86 "_DataImportsInternals.c"
+#line 91 "_DataImportsInternals.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
 	if (_tmp0_) {
 #line 24 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
 		return;
-#line 92 "_DataImportsInternals.c"
+#line 97 "_DataImportsInternals.c"
 	}
 #line 26 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
 	data_imports_terminate ();
 #line 28 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
 	unit_terminate_entry ();
-#line 98 "_DataImportsInternals.c"
+#line 103 "_DataImportsInternals.c"
 }
 
 
diff --git a/src/.unitize/_DbInternals.c b/src/.unitize/_DbInternals.c
index 842d484..c024dc5 100644
--- a/src/.unitize/_DbInternals.c
+++ b/src/.unitize/_DbInternals.c
@@ -1,4 +1,4 @@
-/* _DbInternals.c generated by valac 0.36.6, the Vala compiler
+/* _DbInternals.c generated by valac 0.40.4, the Vala compiler
  * generated from _DbInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -9,6 +9,7 @@
  * Auto-generated file.  Do not modify!
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 
@@ -25,7 +26,9 @@ void db_terminate (void);
 void unit_terminate_entry (void);
 
 
-void db_init_entry (GError** error) {
+void
+db_init_entry (GError** error)
+{
 	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
@@ -36,7 +39,7 @@ void db_init_entry (GError** error) {
 	if (_tmp0_ != 0) {
 #line 15 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
 		return;
-#line 40 "_DbInternals.c"
+#line 43 "_DbInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
 	unit_init_entry (&_inner_error_);
@@ -46,7 +49,7 @@ void db_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
 		return;
-#line 50 "_DbInternals.c"
+#line 53 "_DbInternals.c"
 	}
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
 	db_init (&_inner_error_);
@@ -56,12 +59,14 @@ void db_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
 		return;
-#line 60 "_DbInternals.c"
+#line 63 "_DbInternals.c"
 	}
 }
 
 
-void db_terminate_entry (void) {
+void
+db_terminate_entry (void)
+{
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
@@ -70,7 +75,7 @@ void db_terminate_entry (void) {
 	if (_tmp1_ == 0) {
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
 		_tmp0_ = TRUE;
-#line 74 "_DbInternals.c"
+#line 79 "_DbInternals.c"
 	} else {
 		gint _tmp2_;
 		gint _tmp3_;
@@ -82,19 +87,19 @@ void db_terminate_entry (void) {
 		_tmp3_ = db__unit_init_count;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
 		_tmp0_ = _tmp3_ != 0;
-#line 86 "_DbInternals.c"
+#line 91 "_DbInternals.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
 	if (_tmp0_) {
 #line 24 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
 		return;
-#line 92 "_DbInternals.c"
+#line 97 "_DbInternals.c"
 	}
 #line 26 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
 	db_terminate ();
 #line 28 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
 	unit_terminate_entry ();
-#line 98 "_DbInternals.c"
+#line 103 "_DbInternals.c"
 }
 
 
diff --git a/src/.unitize/_DirectInternals.c b/src/.unitize/_DirectInternals.c
index 1031b9a..e9b9492 100644
--- a/src/.unitize/_DirectInternals.c
+++ b/src/.unitize/_DirectInternals.c
@@ -1,4 +1,4 @@
-/* _DirectInternals.c generated by valac 0.36.6, the Vala compiler
+/* _DirectInternals.c generated by valac 0.40.4, the Vala compiler
  * generated from _DirectInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -9,6 +9,7 @@
  * Auto-generated file.  Do not modify!
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 
@@ -35,7 +36,9 @@ void slideshow_terminate_entry (void);
 void core_terminate_entry (void);
 
 
-void direct_init_entry (GError** error) {
+void
+direct_init_entry (GError** error)
+{
 	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
@@ -46,7 +49,7 @@ void direct_init_entry (GError** error) {
 	if (_tmp0_ != 0) {
 #line 15 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 		return;
-#line 50 "_DirectInternals.c"
+#line 53 "_DirectInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 	unit_init_entry (&_inner_error_);
@@ -56,7 +59,7 @@ void direct_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 		return;
-#line 60 "_DirectInternals.c"
+#line 63 "_DirectInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 	db_init_entry (&_inner_error_);
@@ -66,7 +69,7 @@ void direct_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 		return;
-#line 70 "_DirectInternals.c"
+#line 73 "_DirectInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 	util_init_entry (&_inner_error_);
@@ -76,7 +79,7 @@ void direct_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 		return;
-#line 80 "_DirectInternals.c"
+#line 83 "_DirectInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 	photos_init_entry (&_inner_error_);
@@ -86,7 +89,7 @@ void direct_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 		return;
-#line 90 "_DirectInternals.c"
+#line 93 "_DirectInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 	slideshow_init_entry (&_inner_error_);
@@ -96,7 +99,7 @@ void direct_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 		return;
-#line 100 "_DirectInternals.c"
+#line 103 "_DirectInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 	core_init_entry (&_inner_error_);
@@ -106,7 +109,7 @@ void direct_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 		return;
-#line 110 "_DirectInternals.c"
+#line 113 "_DirectInternals.c"
 	}
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 	direct_init (&_inner_error_);
@@ -116,12 +119,14 @@ void direct_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 		return;
-#line 120 "_DirectInternals.c"
+#line 123 "_DirectInternals.c"
 	}
 }
 
 
-void direct_terminate_entry (void) {
+void
+direct_terminate_entry (void)
+{
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
@@ -130,7 +135,7 @@ void direct_terminate_entry (void) {
 	if (_tmp1_ == 0) {
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 		_tmp0_ = TRUE;
-#line 134 "_DirectInternals.c"
+#line 139 "_DirectInternals.c"
 	} else {
 		gint _tmp2_;
 		gint _tmp3_;
@@ -142,13 +147,13 @@ void direct_terminate_entry (void) {
 		_tmp3_ = direct__unit_init_count;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 		_tmp0_ = _tmp3_ != 0;
-#line 146 "_DirectInternals.c"
+#line 151 "_DirectInternals.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 	if (_tmp0_) {
 #line 24 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 		return;
-#line 152 "_DirectInternals.c"
+#line 157 "_DirectInternals.c"
 	}
 #line 26 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 	direct_terminate ();
@@ -164,7 +169,7 @@ void direct_terminate_entry (void) {
 	slideshow_terminate_entry ();
 #line 28 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 	core_terminate_entry ();
-#line 168 "_DirectInternals.c"
+#line 173 "_DirectInternals.c"
 }
 
 
diff --git a/src/.unitize/_Direct_unitize_entry.c b/src/.unitize/_Direct_unitize_entry.c
index fcfc55a..1e4c50c 100644
--- a/src/.unitize/_Direct_unitize_entry.c
+++ b/src/.unitize/_Direct_unitize_entry.c
@@ -1,4 +1,4 @@
-/* _Direct_unitize_entry.c generated by valac 0.36.6, the Vala compiler
+/* _Direct_unitize_entry.c generated by valac 0.40.4, the Vala compiler
  * generated from _Direct_unitize_entry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -9,6 +9,7 @@
  * Auto-generated file.  Do not modify!
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 
@@ -21,7 +22,9 @@ void direct_app_terminate (void);
 void direct_terminate_entry (void);
 
 
-void direct_app_init (GError** error) {
+void
+direct_app_init (GError** error)
+{
 	GError * _inner_error_ = NULL;
 #line 12 "/home/jens/Source/shotwell/src/.unitize/_Direct_unitize_entry.vala"
 	direct_init_entry (&_inner_error_);
@@ -31,15 +34,17 @@ void direct_app_init (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 12 "/home/jens/Source/shotwell/src/.unitize/_Direct_unitize_entry.vala"
 		return;
-#line 35 "_Direct_unitize_entry.c"
+#line 38 "_Direct_unitize_entry.c"
 	}
 }
 
 
-void direct_app_terminate (void) {
+void
+direct_app_terminate (void)
+{
 #line 16 "/home/jens/Source/shotwell/src/.unitize/_Direct_unitize_entry.vala"
 	direct_terminate_entry ();
-#line 43 "_Direct_unitize_entry.c"
+#line 48 "_Direct_unitize_entry.c"
 }
 
 
diff --git a/src/.unitize/_EditingToolsInternals.c b/src/.unitize/_EditingToolsInternals.c
index 29ec24b..0bce746 100644
--- a/src/.unitize/_EditingToolsInternals.c
+++ b/src/.unitize/_EditingToolsInternals.c
@@ -1,4 +1,4 @@
-/* _EditingToolsInternals.c generated by valac 0.36.6, the Vala compiler
+/* _EditingToolsInternals.c generated by valac 0.40.4, the Vala compiler
  * generated from _EditingToolsInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -9,6 +9,7 @@
  * Auto-generated file.  Do not modify!
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 
@@ -25,7 +26,9 @@ void editing_tools_terminate (void);
 void unit_terminate_entry (void);
 
 
-void editing_tools_init_entry (GError** error) {
+void
+editing_tools_init_entry (GError** error)
+{
 	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
@@ -36,7 +39,7 @@ void editing_tools_init_entry (GError** error) {
 	if (_tmp0_ != 0) {
 #line 15 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
 		return;
-#line 40 "_EditingToolsInternals.c"
+#line 43 "_EditingToolsInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
 	unit_init_entry (&_inner_error_);
@@ -46,7 +49,7 @@ void editing_tools_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
 		return;
-#line 50 "_EditingToolsInternals.c"
+#line 53 "_EditingToolsInternals.c"
 	}
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
 	editing_tools_init (&_inner_error_);
@@ -56,12 +59,14 @@ void editing_tools_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
 		return;
-#line 60 "_EditingToolsInternals.c"
+#line 63 "_EditingToolsInternals.c"
 	}
 }
 
 
-void editing_tools_terminate_entry (void) {
+void
+editing_tools_terminate_entry (void)
+{
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
@@ -70,7 +75,7 @@ void editing_tools_terminate_entry (void) {
 	if (_tmp1_ == 0) {
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
 		_tmp0_ = TRUE;
-#line 74 "_EditingToolsInternals.c"
+#line 79 "_EditingToolsInternals.c"
 	} else {
 		gint _tmp2_;
 		gint _tmp3_;
@@ -82,19 +87,19 @@ void editing_tools_terminate_entry (void) {
 		_tmp3_ = editing_tools__unit_init_count;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
 		_tmp0_ = _tmp3_ != 0;
-#line 86 "_EditingToolsInternals.c"
+#line 91 "_EditingToolsInternals.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
 	if (_tmp0_) {
 #line 24 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
 		return;
-#line 92 "_EditingToolsInternals.c"
+#line 97 "_EditingToolsInternals.c"
 	}
 #line 26 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
 	editing_tools_terminate ();
 #line 28 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
 	unit_terminate_entry ();
-#line 98 "_EditingToolsInternals.c"
+#line 103 "_EditingToolsInternals.c"
 }
 
 
diff --git a/src/.unitize/_EventsInternals.c b/src/.unitize/_EventsInternals.c
index 8ee5b0b..4474675 100644
--- a/src/.unitize/_EventsInternals.c
+++ b/src/.unitize/_EventsInternals.c
@@ -1,4 +1,4 @@
-/* _EventsInternals.c generated by valac 0.36.6, the Vala compiler
+/* _EventsInternals.c generated by valac 0.40.4, the Vala compiler
  * generated from _EventsInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -9,6 +9,7 @@
  * Auto-generated file.  Do not modify!
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 
@@ -27,7 +28,9 @@ void unit_terminate_entry (void);
 void sidebar_terminate_entry (void);
 
 
-void events_init_entry (GError** error) {
+void
+events_init_entry (GError** error)
+{
 	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
@@ -38,7 +41,7 @@ void events_init_entry (GError** error) {
 	if (_tmp0_ != 0) {
 #line 15 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
 		return;
-#line 42 "_EventsInternals.c"
+#line 45 "_EventsInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
 	unit_init_entry (&_inner_error_);
@@ -48,7 +51,7 @@ void events_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
 		return;
-#line 52 "_EventsInternals.c"
+#line 55 "_EventsInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
 	sidebar_init_entry (&_inner_error_);
@@ -58,7 +61,7 @@ void events_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
 		return;
-#line 62 "_EventsInternals.c"
+#line 65 "_EventsInternals.c"
 	}
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
 	events_init (&_inner_error_);
@@ -68,12 +71,14 @@ void events_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
 		return;
-#line 72 "_EventsInternals.c"
+#line 75 "_EventsInternals.c"
 	}
 }
 
 
-void events_terminate_entry (void) {
+void
+events_terminate_entry (void)
+{
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
@@ -82,7 +87,7 @@ void events_terminate_entry (void) {
 	if (_tmp1_ == 0) {
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
 		_tmp0_ = TRUE;
-#line 86 "_EventsInternals.c"
+#line 91 "_EventsInternals.c"
 	} else {
 		gint _tmp2_;
 		gint _tmp3_;
@@ -94,13 +99,13 @@ void events_terminate_entry (void) {
 		_tmp3_ = events__unit_init_count;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
 		_tmp0_ = _tmp3_ != 0;
-#line 98 "_EventsInternals.c"
+#line 103 "_EventsInternals.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
 	if (_tmp0_) {
 #line 24 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
 		return;
-#line 104 "_EventsInternals.c"
+#line 109 "_EventsInternals.c"
 	}
 #line 26 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
 	events_terminate ();
@@ -108,7 +113,7 @@ void events_terminate_entry (void) {
 	unit_terminate_entry ();
 #line 28 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
 	sidebar_terminate_entry ();
-#line 112 "_EventsInternals.c"
+#line 117 "_EventsInternals.c"
 }
 
 
diff --git a/src/.unitize/_FoldersInternals.c b/src/.unitize/_FoldersInternals.c
index 3e32a79..74a8652 100644
--- a/src/.unitize/_FoldersInternals.c
+++ b/src/.unitize/_FoldersInternals.c
@@ -1,4 +1,4 @@
-/* _FoldersInternals.c generated by valac 0.36.6, the Vala compiler
+/* _FoldersInternals.c generated by valac 0.40.4, the Vala compiler
  * generated from _FoldersInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -9,6 +9,7 @@
  * Auto-generated file.  Do not modify!
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 
@@ -29,7 +30,9 @@ void sidebar_terminate_entry (void);
 void photos_terminate_entry (void);
 
 
-void folders_init_entry (GError** error) {
+void
+folders_init_entry (GError** error)
+{
 	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
@@ -40,7 +43,7 @@ void folders_init_entry (GError** error) {
 	if (_tmp0_ != 0) {
 #line 15 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
 		return;
-#line 44 "_FoldersInternals.c"
+#line 47 "_FoldersInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
 	unit_init_entry (&_inner_error_);
@@ -50,7 +53,7 @@ void folders_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
 		return;
-#line 54 "_FoldersInternals.c"
+#line 57 "_FoldersInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
 	sidebar_init_entry (&_inner_error_);
@@ -60,7 +63,7 @@ void folders_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
 		return;
-#line 64 "_FoldersInternals.c"
+#line 67 "_FoldersInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
 	photos_init_entry (&_inner_error_);
@@ -70,7 +73,7 @@ void folders_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
 		return;
-#line 74 "_FoldersInternals.c"
+#line 77 "_FoldersInternals.c"
 	}
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
 	folders_init (&_inner_error_);
@@ -80,12 +83,14 @@ void folders_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
 		return;
-#line 84 "_FoldersInternals.c"
+#line 87 "_FoldersInternals.c"
 	}
 }
 
 
-void folders_terminate_entry (void) {
+void
+folders_terminate_entry (void)
+{
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
@@ -94,7 +99,7 @@ void folders_terminate_entry (void) {
 	if (_tmp1_ == 0) {
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
 		_tmp0_ = TRUE;
-#line 98 "_FoldersInternals.c"
+#line 103 "_FoldersInternals.c"
 	} else {
 		gint _tmp2_;
 		gint _tmp3_;
@@ -106,13 +111,13 @@ void folders_terminate_entry (void) {
 		_tmp3_ = folders__unit_init_count;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
 		_tmp0_ = _tmp3_ != 0;
-#line 110 "_FoldersInternals.c"
+#line 115 "_FoldersInternals.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
 	if (_tmp0_) {
 #line 24 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
 		return;
-#line 116 "_FoldersInternals.c"
+#line 121 "_FoldersInternals.c"
 	}
 #line 26 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
 	folders_terminate ();
@@ -122,7 +127,7 @@ void folders_terminate_entry (void) {
 	sidebar_terminate_entry ();
 #line 28 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
 	photos_terminate_entry ();
-#line 126 "_FoldersInternals.c"
+#line 131 "_FoldersInternals.c"
 }
 
 
diff --git a/src/.unitize/_LibraryInternals.c b/src/.unitize/_LibraryInternals.c
index fd91e7b..84c32c0 100644
--- a/src/.unitize/_LibraryInternals.c
+++ b/src/.unitize/_LibraryInternals.c
@@ -1,4 +1,4 @@
-/* _LibraryInternals.c generated by valac 0.36.6, the Vala compiler
+/* _LibraryInternals.c generated by valac 0.40.4, the Vala compiler
  * generated from _LibraryInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -9,6 +9,7 @@
  * Auto-generated file.  Do not modify!
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 
@@ -55,7 +56,9 @@ void data_imports_terminate_entry (void);
 void folders_terminate_entry (void);
 
 
-void library_init_entry (GError** error) {
+void
+library_init_entry (GError** error)
+{
 	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
@@ -66,7 +69,7 @@ void library_init_entry (GError** error) {
 	if (_tmp0_ != 0) {
 #line 15 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 70 "_LibraryInternals.c"
+#line 73 "_LibraryInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	unit_init_entry (&_inner_error_);
@@ -76,7 +79,7 @@ void library_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 80 "_LibraryInternals.c"
+#line 83 "_LibraryInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	util_init_entry (&_inner_error_);
@@ -86,7 +89,7 @@ void library_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 90 "_LibraryInternals.c"
+#line 93 "_LibraryInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	threads_init_entry (&_inner_error_);
@@ -96,7 +99,7 @@ void library_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 100 "_LibraryInternals.c"
+#line 103 "_LibraryInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	db_init_entry (&_inner_error_);
@@ -106,7 +109,7 @@ void library_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 110 "_LibraryInternals.c"
+#line 113 "_LibraryInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	plugins_init_entry (&_inner_error_);
@@ -116,7 +119,7 @@ void library_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 120 "_LibraryInternals.c"
+#line 123 "_LibraryInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	slideshow_init_entry (&_inner_error_);
@@ -126,7 +129,7 @@ void library_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 130 "_LibraryInternals.c"
+#line 133 "_LibraryInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	photos_init_entry (&_inner_error_);
@@ -136,7 +139,7 @@ void library_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 140 "_LibraryInternals.c"
+#line 143 "_LibraryInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	publishing_init_entry (&_inner_error_);
@@ -146,7 +149,7 @@ void library_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 150 "_LibraryInternals.c"
+#line 153 "_LibraryInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	core_init_entry (&_inner_error_);
@@ -156,7 +159,7 @@ void library_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 160 "_LibraryInternals.c"
+#line 163 "_LibraryInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	sidebar_init_entry (&_inner_error_);
@@ -166,7 +169,7 @@ void library_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 170 "_LibraryInternals.c"
+#line 173 "_LibraryInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	events_init_entry (&_inner_error_);
@@ -176,7 +179,7 @@ void library_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 180 "_LibraryInternals.c"
+#line 183 "_LibraryInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	tags_init_entry (&_inner_error_);
@@ -186,7 +189,7 @@ void library_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 190 "_LibraryInternals.c"
+#line 193 "_LibraryInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	camera_init_entry (&_inner_error_);
@@ -196,7 +199,7 @@ void library_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 200 "_LibraryInternals.c"
+#line 203 "_LibraryInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	searches_init_entry (&_inner_error_);
@@ -206,7 +209,7 @@ void library_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 210 "_LibraryInternals.c"
+#line 213 "_LibraryInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	data_imports_init_entry (&_inner_error_);
@@ -216,7 +219,7 @@ void library_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 220 "_LibraryInternals.c"
+#line 223 "_LibraryInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	folders_init_entry (&_inner_error_);
@@ -226,7 +229,7 @@ void library_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 230 "_LibraryInternals.c"
+#line 233 "_LibraryInternals.c"
 	}
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	library_init (&_inner_error_);
@@ -236,12 +239,14 @@ void library_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 240 "_LibraryInternals.c"
+#line 243 "_LibraryInternals.c"
 	}
 }
 
 
-void library_terminate_entry (void) {
+void
+library_terminate_entry (void)
+{
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
@@ -250,7 +255,7 @@ void library_terminate_entry (void) {
 	if (_tmp1_ == 0) {
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		_tmp0_ = TRUE;
-#line 254 "_LibraryInternals.c"
+#line 259 "_LibraryInternals.c"
 	} else {
 		gint _tmp2_;
 		gint _tmp3_;
@@ -262,13 +267,13 @@ void library_terminate_entry (void) {
 		_tmp3_ = library__unit_init_count;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		_tmp0_ = _tmp3_ != 0;
-#line 266 "_LibraryInternals.c"
+#line 271 "_LibraryInternals.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	if (_tmp0_) {
 #line 24 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 272 "_LibraryInternals.c"
+#line 277 "_LibraryInternals.c"
 	}
 #line 26 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	library_terminate ();
@@ -304,7 +309,7 @@ void library_terminate_entry (void) {
 	data_imports_terminate_entry ();
 #line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	folders_terminate_entry ();
-#line 308 "_LibraryInternals.c"
+#line 313 "_LibraryInternals.c"
 }
 
 
diff --git a/src/.unitize/_Library_unitize_entry.c b/src/.unitize/_Library_unitize_entry.c
index 21c9b1c..a0172d9 100644
--- a/src/.unitize/_Library_unitize_entry.c
+++ b/src/.unitize/_Library_unitize_entry.c
@@ -1,4 +1,4 @@
-/* _Library_unitize_entry.c generated by valac 0.36.6, the Vala compiler
+/* _Library_unitize_entry.c generated by valac 0.40.4, the Vala compiler
  * generated from _Library_unitize_entry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -9,6 +9,7 @@
  * Auto-generated file.  Do not modify!
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 
@@ -21,7 +22,9 @@ void library_app_terminate (void);
 void library_terminate_entry (void);
 
 
-void library_app_init (GError** error) {
+void
+library_app_init (GError** error)
+{
 	GError * _inner_error_ = NULL;
 #line 12 "/home/jens/Source/shotwell/src/.unitize/_Library_unitize_entry.vala"
 	library_init_entry (&_inner_error_);
@@ -31,15 +34,17 @@ void library_app_init (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 12 "/home/jens/Source/shotwell/src/.unitize/_Library_unitize_entry.vala"
 		return;
-#line 35 "_Library_unitize_entry.c"
+#line 38 "_Library_unitize_entry.c"
 	}
 }
 
 
-void library_app_terminate (void) {
+void
+library_app_terminate (void)
+{
 #line 16 "/home/jens/Source/shotwell/src/.unitize/_Library_unitize_entry.vala"
 	library_terminate_entry ();
-#line 43 "_Library_unitize_entry.c"
+#line 48 "_Library_unitize_entry.c"
 }
 
 
diff --git a/src/.unitize/_PhotosInternals.c b/src/.unitize/_PhotosInternals.c
index 0b0b1a0..8a32cae 100644
--- a/src/.unitize/_PhotosInternals.c
+++ b/src/.unitize/_PhotosInternals.c
@@ -1,4 +1,4 @@
-/* _PhotosInternals.c generated by valac 0.36.6, the Vala compiler
+/* _PhotosInternals.c generated by valac 0.40.4, the Vala compiler
  * generated from _PhotosInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -9,6 +9,7 @@
  * Auto-generated file.  Do not modify!
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 
@@ -25,7 +26,9 @@ void photos_terminate (void);
 void unit_terminate_entry (void);
 
 
-void photos_init_entry (GError** error) {
+void
+photos_init_entry (GError** error)
+{
 	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
@@ -36,7 +39,7 @@ void photos_init_entry (GError** error) {
 	if (_tmp0_ != 0) {
 #line 15 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
 		return;
-#line 40 "_PhotosInternals.c"
+#line 43 "_PhotosInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
 	unit_init_entry (&_inner_error_);
@@ -46,7 +49,7 @@ void photos_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
 		return;
-#line 50 "_PhotosInternals.c"
+#line 53 "_PhotosInternals.c"
 	}
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
 	photos_init (&_inner_error_);
@@ -56,12 +59,14 @@ void photos_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
 		return;
-#line 60 "_PhotosInternals.c"
+#line 63 "_PhotosInternals.c"
 	}
 }
 
 
-void photos_terminate_entry (void) {
+void
+photos_terminate_entry (void)
+{
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
@@ -70,7 +75,7 @@ void photos_terminate_entry (void) {
 	if (_tmp1_ == 0) {
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
 		_tmp0_ = TRUE;
-#line 74 "_PhotosInternals.c"
+#line 79 "_PhotosInternals.c"
 	} else {
 		gint _tmp2_;
 		gint _tmp3_;
@@ -82,19 +87,19 @@ void photos_terminate_entry (void) {
 		_tmp3_ = photos__unit_init_count;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
 		_tmp0_ = _tmp3_ != 0;
-#line 86 "_PhotosInternals.c"
+#line 91 "_PhotosInternals.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
 	if (_tmp0_) {
 #line 24 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
 		return;
-#line 92 "_PhotosInternals.c"
+#line 97 "_PhotosInternals.c"
 	}
 #line 26 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
 	photos_terminate ();
 #line 28 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
 	unit_terminate_entry ();
-#line 98 "_PhotosInternals.c"
+#line 103 "_PhotosInternals.c"
 }
 
 
diff --git a/src/.unitize/_PluginsInternals.c b/src/.unitize/_PluginsInternals.c
index f5f81a8..350ca1d 100644
--- a/src/.unitize/_PluginsInternals.c
+++ b/src/.unitize/_PluginsInternals.c
@@ -1,4 +1,4 @@
-/* _PluginsInternals.c generated by valac 0.36.6, the Vala compiler
+/* _PluginsInternals.c generated by valac 0.40.4, the Vala compiler
  * generated from _PluginsInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -9,6 +9,7 @@
  * Auto-generated file.  Do not modify!
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 
@@ -27,7 +28,9 @@ void unit_terminate_entry (void);
 void util_terminate_entry (void);
 
 
-void plugins_init_entry (GError** error) {
+void
+plugins_init_entry (GError** error)
+{
 	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
@@ -38,7 +41,7 @@ void plugins_init_entry (GError** error) {
 	if (_tmp0_ != 0) {
 #line 15 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
 		return;
-#line 42 "_PluginsInternals.c"
+#line 45 "_PluginsInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
 	unit_init_entry (&_inner_error_);
@@ -48,7 +51,7 @@ void plugins_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
 		return;
-#line 52 "_PluginsInternals.c"
+#line 55 "_PluginsInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
 	util_init_entry (&_inner_error_);
@@ -58,7 +61,7 @@ void plugins_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
 		return;
-#line 62 "_PluginsInternals.c"
+#line 65 "_PluginsInternals.c"
 	}
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
 	plugins_init (&_inner_error_);
@@ -68,12 +71,14 @@ void plugins_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
 		return;
-#line 72 "_PluginsInternals.c"
+#line 75 "_PluginsInternals.c"
 	}
 }
 
 
-void plugins_terminate_entry (void) {
+void
+plugins_terminate_entry (void)
+{
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
@@ -82,7 +87,7 @@ void plugins_terminate_entry (void) {
 	if (_tmp1_ == 0) {
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
 		_tmp0_ = TRUE;
-#line 86 "_PluginsInternals.c"
+#line 91 "_PluginsInternals.c"
 	} else {
 		gint _tmp2_;
 		gint _tmp3_;
@@ -94,13 +99,13 @@ void plugins_terminate_entry (void) {
 		_tmp3_ = plugins__unit_init_count;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
 		_tmp0_ = _tmp3_ != 0;
-#line 98 "_PluginsInternals.c"
+#line 103 "_PluginsInternals.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
 	if (_tmp0_) {
 #line 24 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
 		return;
-#line 104 "_PluginsInternals.c"
+#line 109 "_PluginsInternals.c"
 	}
 #line 26 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
 	plugins_terminate ();
@@ -108,7 +113,7 @@ void plugins_terminate_entry (void) {
 	unit_terminate_entry ();
 #line 28 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
 	util_terminate_entry ();
-#line 112 "_PluginsInternals.c"
+#line 117 "_PluginsInternals.c"
 }
 
 
diff --git a/src/.unitize/_PublishingInternals.c b/src/.unitize/_PublishingInternals.c
index 3a969ab..df50c67 100644
--- a/src/.unitize/_PublishingInternals.c
+++ b/src/.unitize/_PublishingInternals.c
@@ -1,4 +1,4 @@
-/* _PublishingInternals.c generated by valac 0.36.6, the Vala compiler
+/* _PublishingInternals.c generated by valac 0.40.4, the Vala compiler
  * generated from _PublishingInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -9,6 +9,7 @@
  * Auto-generated file.  Do not modify!
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 
@@ -27,7 +28,9 @@ void unit_terminate_entry (void);
 void plugins_terminate_entry (void);
 
 
-void publishing_init_entry (GError** error) {
+void
+publishing_init_entry (GError** error)
+{
 	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
@@ -38,7 +41,7 @@ void publishing_init_entry (GError** error) {
 	if (_tmp0_ != 0) {
 #line 15 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
 		return;
-#line 42 "_PublishingInternals.c"
+#line 45 "_PublishingInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
 	unit_init_entry (&_inner_error_);
@@ -48,7 +51,7 @@ void publishing_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
 		return;
-#line 52 "_PublishingInternals.c"
+#line 55 "_PublishingInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
 	plugins_init_entry (&_inner_error_);
@@ -58,7 +61,7 @@ void publishing_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
 		return;
-#line 62 "_PublishingInternals.c"
+#line 65 "_PublishingInternals.c"
 	}
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
 	publishing_init (&_inner_error_);
@@ -68,12 +71,14 @@ void publishing_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
 		return;
-#line 72 "_PublishingInternals.c"
+#line 75 "_PublishingInternals.c"
 	}
 }
 
 
-void publishing_terminate_entry (void) {
+void
+publishing_terminate_entry (void)
+{
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
@@ -82,7 +87,7 @@ void publishing_terminate_entry (void) {
 	if (_tmp1_ == 0) {
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
 		_tmp0_ = TRUE;
-#line 86 "_PublishingInternals.c"
+#line 91 "_PublishingInternals.c"
 	} else {
 		gint _tmp2_;
 		gint _tmp3_;
@@ -94,13 +99,13 @@ void publishing_terminate_entry (void) {
 		_tmp3_ = publishing__unit_init_count;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
 		_tmp0_ = _tmp3_ != 0;
-#line 98 "_PublishingInternals.c"
+#line 103 "_PublishingInternals.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
 	if (_tmp0_) {
 #line 24 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
 		return;
-#line 104 "_PublishingInternals.c"
+#line 109 "_PublishingInternals.c"
 	}
 #line 26 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
 	publishing_terminate ();
@@ -108,7 +113,7 @@ void publishing_terminate_entry (void) {
 	unit_terminate_entry ();
 #line 28 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
 	plugins_terminate_entry ();
-#line 112 "_PublishingInternals.c"
+#line 117 "_PublishingInternals.c"
 }
 
 
diff --git a/src/.unitize/_SearchesInternals.c b/src/.unitize/_SearchesInternals.c
index 9b323db..c630aff 100644
--- a/src/.unitize/_SearchesInternals.c
+++ b/src/.unitize/_SearchesInternals.c
@@ -1,4 +1,4 @@
-/* _SearchesInternals.c generated by valac 0.36.6, the Vala compiler
+/* _SearchesInternals.c generated by valac 0.40.4, the Vala compiler
  * generated from _SearchesInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -9,6 +9,7 @@
  * Auto-generated file.  Do not modify!
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 
@@ -25,7 +26,9 @@ void searches_terminate (void);
 void unit_terminate_entry (void);
 
 
-void searches_init_entry (GError** error) {
+void
+searches_init_entry (GError** error)
+{
 	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
@@ -36,7 +39,7 @@ void searches_init_entry (GError** error) {
 	if (_tmp0_ != 0) {
 #line 15 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
 		return;
-#line 40 "_SearchesInternals.c"
+#line 43 "_SearchesInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
 	unit_init_entry (&_inner_error_);
@@ -46,7 +49,7 @@ void searches_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
 		return;
-#line 50 "_SearchesInternals.c"
+#line 53 "_SearchesInternals.c"
 	}
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
 	searches_init (&_inner_error_);
@@ -56,12 +59,14 @@ void searches_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
 		return;
-#line 60 "_SearchesInternals.c"
+#line 63 "_SearchesInternals.c"
 	}
 }
 
 
-void searches_terminate_entry (void) {
+void
+searches_terminate_entry (void)
+{
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
@@ -70,7 +75,7 @@ void searches_terminate_entry (void) {
 	if (_tmp1_ == 0) {
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
 		_tmp0_ = TRUE;
-#line 74 "_SearchesInternals.c"
+#line 79 "_SearchesInternals.c"
 	} else {
 		gint _tmp2_;
 		gint _tmp3_;
@@ -82,19 +87,19 @@ void searches_terminate_entry (void) {
 		_tmp3_ = searches__unit_init_count;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
 		_tmp0_ = _tmp3_ != 0;
-#line 86 "_SearchesInternals.c"
+#line 91 "_SearchesInternals.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
 	if (_tmp0_) {
 #line 24 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
 		return;
-#line 92 "_SearchesInternals.c"
+#line 97 "_SearchesInternals.c"
 	}
 #line 26 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
 	searches_terminate ();
 #line 28 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
 	unit_terminate_entry ();
-#line 98 "_SearchesInternals.c"
+#line 103 "_SearchesInternals.c"
 }
 
 
diff --git a/src/.unitize/_SidebarInternals.c b/src/.unitize/_SidebarInternals.c
index 19c5e4d..6ea5d4e 100644
--- a/src/.unitize/_SidebarInternals.c
+++ b/src/.unitize/_SidebarInternals.c
@@ -1,4 +1,4 @@
-/* _SidebarInternals.c generated by valac 0.36.6, the Vala compiler
+/* _SidebarInternals.c generated by valac 0.40.4, the Vala compiler
  * generated from _SidebarInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -9,6 +9,7 @@
  * Auto-generated file.  Do not modify!
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 
@@ -25,7 +26,9 @@ void sidebar_terminate (void);
 void unit_terminate_entry (void);
 
 
-void sidebar_init_entry (GError** error) {
+void
+sidebar_init_entry (GError** error)
+{
 	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
@@ -36,7 +39,7 @@ void sidebar_init_entry (GError** error) {
 	if (_tmp0_ != 0) {
 #line 15 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
 		return;
-#line 40 "_SidebarInternals.c"
+#line 43 "_SidebarInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
 	unit_init_entry (&_inner_error_);
@@ -46,7 +49,7 @@ void sidebar_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
 		return;
-#line 50 "_SidebarInternals.c"
+#line 53 "_SidebarInternals.c"
 	}
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
 	sidebar_init (&_inner_error_);
@@ -56,12 +59,14 @@ void sidebar_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
 		return;
-#line 60 "_SidebarInternals.c"
+#line 63 "_SidebarInternals.c"
 	}
 }
 
 
-void sidebar_terminate_entry (void) {
+void
+sidebar_terminate_entry (void)
+{
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
@@ -70,7 +75,7 @@ void sidebar_terminate_entry (void) {
 	if (_tmp1_ == 0) {
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
 		_tmp0_ = TRUE;
-#line 74 "_SidebarInternals.c"
+#line 79 "_SidebarInternals.c"
 	} else {
 		gint _tmp2_;
 		gint _tmp3_;
@@ -82,19 +87,19 @@ void sidebar_terminate_entry (void) {
 		_tmp3_ = sidebar__unit_init_count;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
 		_tmp0_ = _tmp3_ != 0;
-#line 86 "_SidebarInternals.c"
+#line 91 "_SidebarInternals.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
 	if (_tmp0_) {
 #line 24 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
 		return;
-#line 92 "_SidebarInternals.c"
+#line 97 "_SidebarInternals.c"
 	}
 #line 26 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
 	sidebar_terminate ();
 #line 28 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
 	unit_terminate_entry ();
-#line 98 "_SidebarInternals.c"
+#line 103 "_SidebarInternals.c"
 }
 
 
diff --git a/src/.unitize/_SlideshowInternals.c b/src/.unitize/_SlideshowInternals.c
index 3b924bb..1fc0686 100644
--- a/src/.unitize/_SlideshowInternals.c
+++ b/src/.unitize/_SlideshowInternals.c
@@ -1,4 +1,4 @@
-/* _SlideshowInternals.c generated by valac 0.36.6, the Vala compiler
+/* _SlideshowInternals.c generated by valac 0.40.4, the Vala compiler
  * generated from _SlideshowInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -9,6 +9,7 @@
  * Auto-generated file.  Do not modify!
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 
@@ -27,7 +28,9 @@ void unit_terminate_entry (void);
 void plugins_terminate_entry (void);
 
 
-void slideshow_init_entry (GError** error) {
+void
+slideshow_init_entry (GError** error)
+{
 	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
@@ -38,7 +41,7 @@ void slideshow_init_entry (GError** error) {
 	if (_tmp0_ != 0) {
 #line 15 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
 		return;
-#line 42 "_SlideshowInternals.c"
+#line 45 "_SlideshowInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
 	unit_init_entry (&_inner_error_);
@@ -48,7 +51,7 @@ void slideshow_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
 		return;
-#line 52 "_SlideshowInternals.c"
+#line 55 "_SlideshowInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
 	plugins_init_entry (&_inner_error_);
@@ -58,7 +61,7 @@ void slideshow_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
 		return;
-#line 62 "_SlideshowInternals.c"
+#line 65 "_SlideshowInternals.c"
 	}
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
 	slideshow_init (&_inner_error_);
@@ -68,12 +71,14 @@ void slideshow_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
 		return;
-#line 72 "_SlideshowInternals.c"
+#line 75 "_SlideshowInternals.c"
 	}
 }
 
 
-void slideshow_terminate_entry (void) {
+void
+slideshow_terminate_entry (void)
+{
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
@@ -82,7 +87,7 @@ void slideshow_terminate_entry (void) {
 	if (_tmp1_ == 0) {
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
 		_tmp0_ = TRUE;
-#line 86 "_SlideshowInternals.c"
+#line 91 "_SlideshowInternals.c"
 	} else {
 		gint _tmp2_;
 		gint _tmp3_;
@@ -94,13 +99,13 @@ void slideshow_terminate_entry (void) {
 		_tmp3_ = slideshow__unit_init_count;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
 		_tmp0_ = _tmp3_ != 0;
-#line 98 "_SlideshowInternals.c"
+#line 103 "_SlideshowInternals.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
 	if (_tmp0_) {
 #line 24 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
 		return;
-#line 104 "_SlideshowInternals.c"
+#line 109 "_SlideshowInternals.c"
 	}
 #line 26 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
 	slideshow_terminate ();
@@ -108,7 +113,7 @@ void slideshow_terminate_entry (void) {
 	unit_terminate_entry ();
 #line 28 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
 	plugins_terminate_entry ();
-#line 112 "_SlideshowInternals.c"
+#line 117 "_SlideshowInternals.c"
 }
 
 
diff --git a/src/.unitize/_TagsInternals.c b/src/.unitize/_TagsInternals.c
index a538593..0383b23 100644
--- a/src/.unitize/_TagsInternals.c
+++ b/src/.unitize/_TagsInternals.c
@@ -1,4 +1,4 @@
-/* _TagsInternals.c generated by valac 0.36.6, the Vala compiler
+/* _TagsInternals.c generated by valac 0.40.4, the Vala compiler
  * generated from _TagsInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -9,6 +9,7 @@
  * Auto-generated file.  Do not modify!
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 
@@ -27,7 +28,9 @@ void unit_terminate_entry (void);
 void sidebar_terminate_entry (void);
 
 
-void tags_init_entry (GError** error) {
+void
+tags_init_entry (GError** error)
+{
 	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
@@ -38,7 +41,7 @@ void tags_init_entry (GError** error) {
 	if (_tmp0_ != 0) {
 #line 15 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
 		return;
-#line 42 "_TagsInternals.c"
+#line 45 "_TagsInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
 	unit_init_entry (&_inner_error_);
@@ -48,7 +51,7 @@ void tags_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
 		return;
-#line 52 "_TagsInternals.c"
+#line 55 "_TagsInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
 	sidebar_init_entry (&_inner_error_);
@@ -58,7 +61,7 @@ void tags_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
 		return;
-#line 62 "_TagsInternals.c"
+#line 65 "_TagsInternals.c"
 	}
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
 	tags_init (&_inner_error_);
@@ -68,12 +71,14 @@ void tags_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
 		return;
-#line 72 "_TagsInternals.c"
+#line 75 "_TagsInternals.c"
 	}
 }
 
 
-void tags_terminate_entry (void) {
+void
+tags_terminate_entry (void)
+{
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
@@ -82,7 +87,7 @@ void tags_terminate_entry (void) {
 	if (_tmp1_ == 0) {
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
 		_tmp0_ = TRUE;
-#line 86 "_TagsInternals.c"
+#line 91 "_TagsInternals.c"
 	} else {
 		gint _tmp2_;
 		gint _tmp3_;
@@ -94,13 +99,13 @@ void tags_terminate_entry (void) {
 		_tmp3_ = tags__unit_init_count;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
 		_tmp0_ = _tmp3_ != 0;
-#line 98 "_TagsInternals.c"
+#line 103 "_TagsInternals.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
 	if (_tmp0_) {
 #line 24 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
 		return;
-#line 104 "_TagsInternals.c"
+#line 109 "_TagsInternals.c"
 	}
 #line 26 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
 	tags_terminate ();
@@ -108,7 +113,7 @@ void tags_terminate_entry (void) {
 	unit_terminate_entry ();
 #line 28 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
 	sidebar_terminate_entry ();
-#line 112 "_TagsInternals.c"
+#line 117 "_TagsInternals.c"
 }
 
 
diff --git a/src/.unitize/_ThreadsInternals.c b/src/.unitize/_ThreadsInternals.c
index f4bba14..db67d9d 100644
--- a/src/.unitize/_ThreadsInternals.c
+++ b/src/.unitize/_ThreadsInternals.c
@@ -1,4 +1,4 @@
-/* _ThreadsInternals.c generated by valac 0.36.6, the Vala compiler
+/* _ThreadsInternals.c generated by valac 0.40.4, the Vala compiler
  * generated from _ThreadsInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -9,6 +9,7 @@
  * Auto-generated file.  Do not modify!
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 
@@ -25,7 +26,9 @@ void threads_terminate (void);
 void unit_terminate_entry (void);
 
 
-void threads_init_entry (GError** error) {
+void
+threads_init_entry (GError** error)
+{
 	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
@@ -36,7 +39,7 @@ void threads_init_entry (GError** error) {
 	if (_tmp0_ != 0) {
 #line 15 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
 		return;
-#line 40 "_ThreadsInternals.c"
+#line 43 "_ThreadsInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
 	unit_init_entry (&_inner_error_);
@@ -46,7 +49,7 @@ void threads_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
 		return;
-#line 50 "_ThreadsInternals.c"
+#line 53 "_ThreadsInternals.c"
 	}
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
 	threads_init (&_inner_error_);
@@ -56,12 +59,14 @@ void threads_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
 		return;
-#line 60 "_ThreadsInternals.c"
+#line 63 "_ThreadsInternals.c"
 	}
 }
 
 
-void threads_terminate_entry (void) {
+void
+threads_terminate_entry (void)
+{
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
@@ -70,7 +75,7 @@ void threads_terminate_entry (void) {
 	if (_tmp1_ == 0) {
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
 		_tmp0_ = TRUE;
-#line 74 "_ThreadsInternals.c"
+#line 79 "_ThreadsInternals.c"
 	} else {
 		gint _tmp2_;
 		gint _tmp3_;
@@ -82,19 +87,19 @@ void threads_terminate_entry (void) {
 		_tmp3_ = threads__unit_init_count;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
 		_tmp0_ = _tmp3_ != 0;
-#line 86 "_ThreadsInternals.c"
+#line 91 "_ThreadsInternals.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
 	if (_tmp0_) {
 #line 24 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
 		return;
-#line 92 "_ThreadsInternals.c"
+#line 97 "_ThreadsInternals.c"
 	}
 #line 26 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
 	threads_terminate ();
 #line 28 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
 	unit_terminate_entry ();
-#line 98 "_ThreadsInternals.c"
+#line 103 "_ThreadsInternals.c"
 }
 
 
diff --git a/src/.unitize/_UnitInternals.c b/src/.unitize/_UnitInternals.c
index ee8e879..998da34 100644
--- a/src/.unitize/_UnitInternals.c
+++ b/src/.unitize/_UnitInternals.c
@@ -1,4 +1,4 @@
-/* _UnitInternals.c generated by valac 0.36.6, the Vala compiler
+/* _UnitInternals.c generated by valac 0.40.4, the Vala compiler
  * generated from _UnitInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -9,6 +9,7 @@
  * Auto-generated file.  Do not modify!
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 
@@ -23,7 +24,9 @@ void unit_terminate_entry (void);
 void unit_terminate (void);
 
 
-void unit_init_entry (GError** error) {
+void
+unit_init_entry (GError** error)
+{
 	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
@@ -34,7 +37,7 @@ void unit_init_entry (GError** error) {
 	if (_tmp0_ != 0) {
 #line 15 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
 		return;
-#line 38 "_UnitInternals.c"
+#line 41 "_UnitInternals.c"
 	}
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
 	unit_init (&_inner_error_);
@@ -44,12 +47,14 @@ void unit_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
 		return;
-#line 48 "_UnitInternals.c"
+#line 51 "_UnitInternals.c"
 	}
 }
 
 
-void unit_terminate_entry (void) {
+void
+unit_terminate_entry (void)
+{
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
@@ -58,7 +63,7 @@ void unit_terminate_entry (void) {
 	if (_tmp1_ == 0) {
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
 		_tmp0_ = TRUE;
-#line 62 "_UnitInternals.c"
+#line 67 "_UnitInternals.c"
 	} else {
 		gint _tmp2_;
 		gint _tmp3_;
@@ -70,17 +75,17 @@ void unit_terminate_entry (void) {
 		_tmp3_ = unit__unit_init_count;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
 		_tmp0_ = _tmp3_ != 0;
-#line 74 "_UnitInternals.c"
+#line 79 "_UnitInternals.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
 	if (_tmp0_) {
 #line 24 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
 		return;
-#line 80 "_UnitInternals.c"
+#line 85 "_UnitInternals.c"
 	}
 #line 26 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
 	unit_terminate ();
-#line 84 "_UnitInternals.c"
+#line 89 "_UnitInternals.c"
 }
 
 
diff --git a/src/.unitize/_UtilInternals.c b/src/.unitize/_UtilInternals.c
index 628306b..c52fbcd 100644
--- a/src/.unitize/_UtilInternals.c
+++ b/src/.unitize/_UtilInternals.c
@@ -1,4 +1,4 @@
-/* _UtilInternals.c generated by valac 0.36.6, the Vala compiler
+/* _UtilInternals.c generated by valac 0.40.4, the Vala compiler
  * generated from _UtilInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -9,6 +9,7 @@
  * Auto-generated file.  Do not modify!
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 
@@ -25,7 +26,9 @@ void util_terminate (void);
 void unit_terminate_entry (void);
 
 
-void util_init_entry (GError** error) {
+void
+util_init_entry (GError** error)
+{
 	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
@@ -36,7 +39,7 @@ void util_init_entry (GError** error) {
 	if (_tmp0_ != 0) {
 #line 15 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
 		return;
-#line 40 "_UtilInternals.c"
+#line 43 "_UtilInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
 	unit_init_entry (&_inner_error_);
@@ -46,7 +49,7 @@ void util_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
 		return;
-#line 50 "_UtilInternals.c"
+#line 53 "_UtilInternals.c"
 	}
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
 	util_init (&_inner_error_);
@@ -56,12 +59,14 @@ void util_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
 		return;
-#line 60 "_UtilInternals.c"
+#line 63 "_UtilInternals.c"
 	}
 }
 
 
-void util_terminate_entry (void) {
+void
+util_terminate_entry (void)
+{
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
@@ -70,7 +75,7 @@ void util_terminate_entry (void) {
 	if (_tmp1_ == 0) {
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
 		_tmp0_ = TRUE;
-#line 74 "_UtilInternals.c"
+#line 79 "_UtilInternals.c"
 	} else {
 		gint _tmp2_;
 		gint _tmp3_;
@@ -82,19 +87,19 @@ void util_terminate_entry (void) {
 		_tmp3_ = util__unit_init_count;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
 		_tmp0_ = _tmp3_ != 0;
-#line 86 "_UtilInternals.c"
+#line 91 "_UtilInternals.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
 	if (_tmp0_) {
 #line 24 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
 		return;
-#line 92 "_UtilInternals.c"
+#line 97 "_UtilInternals.c"
 	}
 #line 26 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
 	util_terminate ();
 #line 28 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
 	unit_terminate_entry ();
-#line 98 "_UtilInternals.c"
+#line 103 "_UtilInternals.c"
 }