New upstream version 0.30.1upstream/0.30.1

22 files changed, 0 insertions, 2600 deletions

diff --git a/src/.unitize/_CameraInternals.c b/src/.unitize/_CameraInternals.c
deleted file mode 100644
index e3fa04d..0000000
--- a/src/.unitize/_CameraInternals.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/* _CameraInternals.c generated by valac 0.40.4, the Vala compiler
- * generated from _CameraInternals.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- *
- * Auto-generated file.  Do not modify!
- */
-
-
-#include <glib.h>
-#include <glib-object.h>
-
-
-
-extern gint camera__unit_init_count;
-gint camera__unit_init_count = 0;
-
-void camera_init_entry (GError** error);
-void unit_init_entry (GError** error);
-void sidebar_init_entry (GError** error);
-void camera_init (GError** error);
-void camera_terminate_entry (void);
-void camera_terminate (void);
-void unit_terminate_entry (void);
-void sidebar_terminate_entry (void);
-
-
-void
-camera_init_entry (GError** error)
-{
-	gint _tmp0_;
-	GError * _inner_error_ = NULL;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
-	_tmp0_ = camera__unit_init_count;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
-	camera__unit_init_count = _tmp0_ + 1;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
-	if (_tmp0_ != 0) {
-#line 15 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
-		return;
-#line 45 "_CameraInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
-	unit_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
-		return;
-#line 55 "_CameraInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
-	sidebar_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
-		return;
-#line 65 "_CameraInternals.c"
-	}
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
-	camera_init (&_inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
-		return;
-#line 75 "_CameraInternals.c"
-	}
-}
-
-
-void
-camera_terminate_entry (void)
-{
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
-	_tmp1_ = camera__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
-	if (_tmp1_ == 0) {
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
-		_tmp0_ = TRUE;
-#line 91 "_CameraInternals.c"
-	} else {
-		gint _tmp2_;
-		gint _tmp3_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
-		_tmp2_ = camera__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
-		camera__unit_init_count = _tmp2_ - 1;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
-		_tmp3_ = camera__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
-		_tmp0_ = _tmp3_ != 0;
-#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 109 "_CameraInternals.c"
-	}
-#line 26 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
-	camera_terminate ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
-	unit_terminate_entry ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
-	sidebar_terminate_entry ();
-#line 117 "_CameraInternals.c"
-}
-
-
-
diff --git a/src/.unitize/_ConfigInternals.c b/src/.unitize/_ConfigInternals.c
deleted file mode 100644
index a9c0493..0000000
--- a/src/.unitize/_ConfigInternals.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* _ConfigInternals.c generated by valac 0.40.4, the Vala compiler
- * generated from _ConfigInternals.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- *
- * Auto-generated file.  Do not modify!
- */
-
-
-#include <glib.h>
-#include <glib-object.h>
-
-
-
-extern gint config__unit_init_count;
-gint config__unit_init_count = 0;
-
-void config_init_entry (GError** error);
-void unit_init_entry (GError** error);
-void config_init (GError** error);
-void config_terminate_entry (void);
-void config_terminate (void);
-void unit_terminate_entry (void);
-
-
-void
-config_init_entry (GError** error)
-{
-	gint _tmp0_;
-	GError * _inner_error_ = NULL;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
-	_tmp0_ = config__unit_init_count;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
-	config__unit_init_count = _tmp0_ + 1;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
-	if (_tmp0_ != 0) {
-#line 15 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
-		return;
-#line 43 "_ConfigInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
-	unit_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
-		return;
-#line 53 "_ConfigInternals.c"
-	}
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
-	config_init (&_inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
-		return;
-#line 63 "_ConfigInternals.c"
-	}
-}
-
-
-void
-config_terminate_entry (void)
-{
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
-	_tmp1_ = config__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
-	if (_tmp1_ == 0) {
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
-		_tmp0_ = TRUE;
-#line 79 "_ConfigInternals.c"
-	} else {
-		gint _tmp2_;
-		gint _tmp3_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
-		_tmp2_ = config__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
-		config__unit_init_count = _tmp2_ - 1;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
-		_tmp3_ = config__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
-		_tmp0_ = _tmp3_ != 0;
-#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 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 103 "_ConfigInternals.c"
-}
-
-
-
diff --git a/src/.unitize/_CoreInternals.c b/src/.unitize/_CoreInternals.c
deleted file mode 100644
index c53d97d..0000000
--- a/src/.unitize/_CoreInternals.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* _CoreInternals.c generated by valac 0.40.4, the Vala compiler
- * generated from _CoreInternals.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- *
- * Auto-generated file.  Do not modify!
- */
-
-
-#include <glib.h>
-#include <glib-object.h>
-
-
-
-extern gint core__unit_init_count;
-gint core__unit_init_count = 0;
-
-void core_init_entry (GError** error);
-void unit_init_entry (GError** error);
-void core_init (GError** error);
-void core_terminate_entry (void);
-void core_terminate (void);
-void unit_terminate_entry (void);
-
-
-void
-core_init_entry (GError** error)
-{
-	gint _tmp0_;
-	GError * _inner_error_ = NULL;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
-	_tmp0_ = core__unit_init_count;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
-	core__unit_init_count = _tmp0_ + 1;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
-	if (_tmp0_ != 0) {
-#line 15 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
-		return;
-#line 43 "_CoreInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
-	unit_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
-		return;
-#line 53 "_CoreInternals.c"
-	}
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
-	core_init (&_inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
-		return;
-#line 63 "_CoreInternals.c"
-	}
-}
-
-
-void
-core_terminate_entry (void)
-{
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
-	_tmp1_ = core__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
-	if (_tmp1_ == 0) {
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
-		_tmp0_ = TRUE;
-#line 79 "_CoreInternals.c"
-	} else {
-		gint _tmp2_;
-		gint _tmp3_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
-		_tmp2_ = core__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
-		core__unit_init_count = _tmp2_ - 1;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
-		_tmp3_ = core__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
-		_tmp0_ = _tmp3_ != 0;
-#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 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 103 "_CoreInternals.c"
-}
-
-
-
diff --git a/src/.unitize/_DataImportsInternals.c b/src/.unitize/_DataImportsInternals.c
deleted file mode 100644
index e99bde1..0000000
--- a/src/.unitize/_DataImportsInternals.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* _DataImportsInternals.c generated by valac 0.40.4, the Vala compiler
- * generated from _DataImportsInternals.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- *
- * Auto-generated file.  Do not modify!
- */
-
-
-#include <glib.h>
-#include <glib-object.h>
-
-
-
-extern gint data_imports__unit_init_count;
-gint data_imports__unit_init_count = 0;
-
-void data_imports_init_entry (GError** error);
-void unit_init_entry (GError** error);
-void data_imports_init (GError** error);
-void data_imports_terminate_entry (void);
-void data_imports_terminate (void);
-void unit_terminate_entry (void);
-
-
-void
-data_imports_init_entry (GError** error)
-{
-	gint _tmp0_;
-	GError * _inner_error_ = NULL;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
-	_tmp0_ = data_imports__unit_init_count;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
-	data_imports__unit_init_count = _tmp0_ + 1;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
-	if (_tmp0_ != 0) {
-#line 15 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
-		return;
-#line 43 "_DataImportsInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
-	unit_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
-		return;
-#line 53 "_DataImportsInternals.c"
-	}
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
-	data_imports_init (&_inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
-		return;
-#line 63 "_DataImportsInternals.c"
-	}
-}
-
-
-void
-data_imports_terminate_entry (void)
-{
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
-	_tmp1_ = data_imports__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
-	if (_tmp1_ == 0) {
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
-		_tmp0_ = TRUE;
-#line 79 "_DataImportsInternals.c"
-	} else {
-		gint _tmp2_;
-		gint _tmp3_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
-		_tmp2_ = data_imports__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
-		data_imports__unit_init_count = _tmp2_ - 1;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
-		_tmp3_ = data_imports__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
-		_tmp0_ = _tmp3_ != 0;
-#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 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 103 "_DataImportsInternals.c"
-}
-
-
-
diff --git a/src/.unitize/_DbInternals.c b/src/.unitize/_DbInternals.c
deleted file mode 100644
index c024dc5..0000000
--- a/src/.unitize/_DbInternals.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* _DbInternals.c generated by valac 0.40.4, the Vala compiler
- * generated from _DbInternals.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- *
- * Auto-generated file.  Do not modify!
- */
-
-
-#include <glib.h>
-#include <glib-object.h>
-
-
-
-extern gint db__unit_init_count;
-gint db__unit_init_count = 0;
-
-void db_init_entry (GError** error);
-void unit_init_entry (GError** error);
-void db_init (GError** error);
-void db_terminate_entry (void);
-void db_terminate (void);
-void unit_terminate_entry (void);
-
-
-void
-db_init_entry (GError** error)
-{
-	gint _tmp0_;
-	GError * _inner_error_ = NULL;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
-	_tmp0_ = db__unit_init_count;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
-	db__unit_init_count = _tmp0_ + 1;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
-	if (_tmp0_ != 0) {
-#line 15 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
-		return;
-#line 43 "_DbInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
-	unit_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
-		return;
-#line 53 "_DbInternals.c"
-	}
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
-	db_init (&_inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
-		return;
-#line 63 "_DbInternals.c"
-	}
-}
-
-
-void
-db_terminate_entry (void)
-{
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
-	_tmp1_ = db__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
-	if (_tmp1_ == 0) {
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
-		_tmp0_ = TRUE;
-#line 79 "_DbInternals.c"
-	} else {
-		gint _tmp2_;
-		gint _tmp3_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
-		_tmp2_ = db__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
-		db__unit_init_count = _tmp2_ - 1;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
-		_tmp3_ = db__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
-		_tmp0_ = _tmp3_ != 0;
-#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 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 103 "_DbInternals.c"
-}
-
-
-
diff --git a/src/.unitize/_DirectInternals.c b/src/.unitize/_DirectInternals.c
deleted file mode 100644
index e9b9492..0000000
--- a/src/.unitize/_DirectInternals.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/* _DirectInternals.c generated by valac 0.40.4, the Vala compiler
- * generated from _DirectInternals.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- *
- * Auto-generated file.  Do not modify!
- */
-
-
-#include <glib.h>
-#include <glib-object.h>
-
-
-
-extern gint direct__unit_init_count;
-gint direct__unit_init_count = 0;
-
-void direct_init_entry (GError** error);
-void unit_init_entry (GError** error);
-void db_init_entry (GError** error);
-void util_init_entry (GError** error);
-void photos_init_entry (GError** error);
-void slideshow_init_entry (GError** error);
-void core_init_entry (GError** error);
-void direct_init (GError** error);
-void direct_terminate_entry (void);
-void direct_terminate (void);
-void unit_terminate_entry (void);
-void db_terminate_entry (void);
-void util_terminate_entry (void);
-void photos_terminate_entry (void);
-void slideshow_terminate_entry (void);
-void core_terminate_entry (void);
-
-
-void
-direct_init_entry (GError** error)
-{
-	gint _tmp0_;
-	GError * _inner_error_ = NULL;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-	_tmp0_ = direct__unit_init_count;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-	direct__unit_init_count = _tmp0_ + 1;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-	if (_tmp0_ != 0) {
-#line 15 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-		return;
-#line 53 "_DirectInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-	unit_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-		return;
-#line 63 "_DirectInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-	db_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-		return;
-#line 73 "_DirectInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-	util_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-		return;
-#line 83 "_DirectInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-	photos_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-		return;
-#line 93 "_DirectInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-	slideshow_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-		return;
-#line 103 "_DirectInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-	core_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-		return;
-#line 113 "_DirectInternals.c"
-	}
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-	direct_init (&_inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-		return;
-#line 123 "_DirectInternals.c"
-	}
-}
-
-
-void
-direct_terminate_entry (void)
-{
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-	_tmp1_ = direct__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-	if (_tmp1_ == 0) {
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-		_tmp0_ = TRUE;
-#line 139 "_DirectInternals.c"
-	} else {
-		gint _tmp2_;
-		gint _tmp3_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-		_tmp2_ = direct__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-		direct__unit_init_count = _tmp2_ - 1;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-		_tmp3_ = direct__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-		_tmp0_ = _tmp3_ != 0;
-#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 157 "_DirectInternals.c"
-	}
-#line 26 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-	direct_terminate ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-	unit_terminate_entry ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-	db_terminate_entry ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-	util_terminate_entry ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-	photos_terminate_entry ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-	slideshow_terminate_entry ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
-	core_terminate_entry ();
-#line 173 "_DirectInternals.c"
-}
-
-
-
diff --git a/src/.unitize/_Direct_unitize_entry.c b/src/.unitize/_Direct_unitize_entry.c
deleted file mode 100644
index 1e4c50c..0000000
--- a/src/.unitize/_Direct_unitize_entry.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* _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.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- *
- * Auto-generated file.  Do not modify!
- */
-
-
-#include <glib.h>
-#include <glib-object.h>
-
-
-
-
-void direct_app_init (GError** error);
-void direct_init_entry (GError** error);
-void direct_app_terminate (void);
-void direct_terminate_entry (void);
-
-
-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_);
-#line 12 "/home/jens/Source/shotwell/src/.unitize/_Direct_unitize_entry.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12 "/home/jens/Source/shotwell/src/.unitize/_Direct_unitize_entry.vala"
-		g_propagate_error (error, _inner_error_);
-#line 12 "/home/jens/Source/shotwell/src/.unitize/_Direct_unitize_entry.vala"
-		return;
-#line 38 "_Direct_unitize_entry.c"
-	}
-}
-
-
-void
-direct_app_terminate (void)
-{
-#line 16 "/home/jens/Source/shotwell/src/.unitize/_Direct_unitize_entry.vala"
-	direct_terminate_entry ();
-#line 48 "_Direct_unitize_entry.c"
-}
-
-
-
diff --git a/src/.unitize/_EditingToolsInternals.c b/src/.unitize/_EditingToolsInternals.c
deleted file mode 100644
index 0bce746..0000000
--- a/src/.unitize/_EditingToolsInternals.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* _EditingToolsInternals.c generated by valac 0.40.4, the Vala compiler
- * generated from _EditingToolsInternals.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- *
- * Auto-generated file.  Do not modify!
- */
-
-
-#include <glib.h>
-#include <glib-object.h>
-
-
-
-extern gint editing_tools__unit_init_count;
-gint editing_tools__unit_init_count = 0;
-
-void editing_tools_init_entry (GError** error);
-void unit_init_entry (GError** error);
-void editing_tools_init (GError** error);
-void editing_tools_terminate_entry (void);
-void editing_tools_terminate (void);
-void unit_terminate_entry (void);
-
-
-void
-editing_tools_init_entry (GError** error)
-{
-	gint _tmp0_;
-	GError * _inner_error_ = NULL;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
-	_tmp0_ = editing_tools__unit_init_count;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
-	editing_tools__unit_init_count = _tmp0_ + 1;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
-	if (_tmp0_ != 0) {
-#line 15 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
-		return;
-#line 43 "_EditingToolsInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
-	unit_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
-		return;
-#line 53 "_EditingToolsInternals.c"
-	}
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
-	editing_tools_init (&_inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
-		return;
-#line 63 "_EditingToolsInternals.c"
-	}
-}
-
-
-void
-editing_tools_terminate_entry (void)
-{
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
-	_tmp1_ = editing_tools__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
-	if (_tmp1_ == 0) {
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
-		_tmp0_ = TRUE;
-#line 79 "_EditingToolsInternals.c"
-	} else {
-		gint _tmp2_;
-		gint _tmp3_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
-		_tmp2_ = editing_tools__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
-		editing_tools__unit_init_count = _tmp2_ - 1;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
-		_tmp3_ = editing_tools__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
-		_tmp0_ = _tmp3_ != 0;
-#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 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 103 "_EditingToolsInternals.c"
-}
-
-
-
diff --git a/src/.unitize/_EventsInternals.c b/src/.unitize/_EventsInternals.c
deleted file mode 100644
index 4474675..0000000
--- a/src/.unitize/_EventsInternals.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/* _EventsInternals.c generated by valac 0.40.4, the Vala compiler
- * generated from _EventsInternals.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- *
- * Auto-generated file.  Do not modify!
- */
-
-
-#include <glib.h>
-#include <glib-object.h>
-
-
-
-extern gint events__unit_init_count;
-gint events__unit_init_count = 0;
-
-void events_init_entry (GError** error);
-void unit_init_entry (GError** error);
-void sidebar_init_entry (GError** error);
-void events_init (GError** error);
-void events_terminate_entry (void);
-void events_terminate (void);
-void unit_terminate_entry (void);
-void sidebar_terminate_entry (void);
-
-
-void
-events_init_entry (GError** error)
-{
-	gint _tmp0_;
-	GError * _inner_error_ = NULL;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
-	_tmp0_ = events__unit_init_count;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
-	events__unit_init_count = _tmp0_ + 1;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
-	if (_tmp0_ != 0) {
-#line 15 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
-		return;
-#line 45 "_EventsInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
-	unit_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
-		return;
-#line 55 "_EventsInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
-	sidebar_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
-		return;
-#line 65 "_EventsInternals.c"
-	}
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
-	events_init (&_inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
-		return;
-#line 75 "_EventsInternals.c"
-	}
-}
-
-
-void
-events_terminate_entry (void)
-{
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
-	_tmp1_ = events__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
-	if (_tmp1_ == 0) {
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
-		_tmp0_ = TRUE;
-#line 91 "_EventsInternals.c"
-	} else {
-		gint _tmp2_;
-		gint _tmp3_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
-		_tmp2_ = events__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
-		events__unit_init_count = _tmp2_ - 1;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
-		_tmp3_ = events__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
-		_tmp0_ = _tmp3_ != 0;
-#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 109 "_EventsInternals.c"
-	}
-#line 26 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
-	events_terminate ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
-	unit_terminate_entry ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
-	sidebar_terminate_entry ();
-#line 117 "_EventsInternals.c"
-}
-
-
-
diff --git a/src/.unitize/_FoldersInternals.c b/src/.unitize/_FoldersInternals.c
deleted file mode 100644
index 74a8652..0000000
--- a/src/.unitize/_FoldersInternals.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/* _FoldersInternals.c generated by valac 0.40.4, the Vala compiler
- * generated from _FoldersInternals.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- *
- * Auto-generated file.  Do not modify!
- */
-
-
-#include <glib.h>
-#include <glib-object.h>
-
-
-
-extern gint folders__unit_init_count;
-gint folders__unit_init_count = 0;
-
-void folders_init_entry (GError** error);
-void unit_init_entry (GError** error);
-void sidebar_init_entry (GError** error);
-void photos_init_entry (GError** error);
-void folders_init (GError** error);
-void folders_terminate_entry (void);
-void folders_terminate (void);
-void unit_terminate_entry (void);
-void sidebar_terminate_entry (void);
-void photos_terminate_entry (void);
-
-
-void
-folders_init_entry (GError** error)
-{
-	gint _tmp0_;
-	GError * _inner_error_ = NULL;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
-	_tmp0_ = folders__unit_init_count;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
-	folders__unit_init_count = _tmp0_ + 1;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
-	if (_tmp0_ != 0) {
-#line 15 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
-		return;
-#line 47 "_FoldersInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
-	unit_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
-		return;
-#line 57 "_FoldersInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
-	sidebar_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
-		return;
-#line 67 "_FoldersInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
-	photos_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
-		return;
-#line 77 "_FoldersInternals.c"
-	}
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
-	folders_init (&_inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
-		return;
-#line 87 "_FoldersInternals.c"
-	}
-}
-
-
-void
-folders_terminate_entry (void)
-{
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
-	_tmp1_ = folders__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
-	if (_tmp1_ == 0) {
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
-		_tmp0_ = TRUE;
-#line 103 "_FoldersInternals.c"
-	} else {
-		gint _tmp2_;
-		gint _tmp3_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
-		_tmp2_ = folders__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
-		folders__unit_init_count = _tmp2_ - 1;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
-		_tmp3_ = folders__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
-		_tmp0_ = _tmp3_ != 0;
-#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 121 "_FoldersInternals.c"
-	}
-#line 26 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
-	folders_terminate ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
-	unit_terminate_entry ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
-	sidebar_terminate_entry ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
-	photos_terminate_entry ();
-#line 131 "_FoldersInternals.c"
-}
-
-
-
diff --git a/src/.unitize/_LibraryInternals.c b/src/.unitize/_LibraryInternals.c
deleted file mode 100644
index 84c32c0..0000000
--- a/src/.unitize/_LibraryInternals.c
+++ /dev/null
@@ -1,316 +0,0 @@
-/* _LibraryInternals.c generated by valac 0.40.4, the Vala compiler
- * generated from _LibraryInternals.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- *
- * Auto-generated file.  Do not modify!
- */
-
-
-#include <glib.h>
-#include <glib-object.h>
-
-
-
-extern gint library__unit_init_count;
-gint library__unit_init_count = 0;
-
-void library_init_entry (GError** error);
-void unit_init_entry (GError** error);
-void util_init_entry (GError** error);
-void threads_init_entry (GError** error);
-void db_init_entry (GError** error);
-void plugins_init_entry (GError** error);
-void slideshow_init_entry (GError** error);
-void photos_init_entry (GError** error);
-void publishing_init_entry (GError** error);
-void core_init_entry (GError** error);
-void sidebar_init_entry (GError** error);
-void events_init_entry (GError** error);
-void tags_init_entry (GError** error);
-void camera_init_entry (GError** error);
-void searches_init_entry (GError** error);
-void data_imports_init_entry (GError** error);
-void folders_init_entry (GError** error);
-void library_init (GError** error);
-void library_terminate_entry (void);
-void library_terminate (void);
-void unit_terminate_entry (void);
-void util_terminate_entry (void);
-void threads_terminate_entry (void);
-void db_terminate_entry (void);
-void plugins_terminate_entry (void);
-void slideshow_terminate_entry (void);
-void photos_terminate_entry (void);
-void publishing_terminate_entry (void);
-void core_terminate_entry (void);
-void sidebar_terminate_entry (void);
-void events_terminate_entry (void);
-void tags_terminate_entry (void);
-void camera_terminate_entry (void);
-void searches_terminate_entry (void);
-void data_imports_terminate_entry (void);
-void folders_terminate_entry (void);
-
-
-void
-library_init_entry (GError** error)
-{
-	gint _tmp0_;
-	GError * _inner_error_ = NULL;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	_tmp0_ = library__unit_init_count;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	library__unit_init_count = _tmp0_ + 1;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	if (_tmp0_ != 0) {
-#line 15 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		return;
-#line 73 "_LibraryInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	unit_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		return;
-#line 83 "_LibraryInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	util_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		return;
-#line 93 "_LibraryInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	threads_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		return;
-#line 103 "_LibraryInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	db_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		return;
-#line 113 "_LibraryInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	plugins_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		return;
-#line 123 "_LibraryInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	slideshow_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		return;
-#line 133 "_LibraryInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	photos_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		return;
-#line 143 "_LibraryInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	publishing_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		return;
-#line 153 "_LibraryInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	core_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		return;
-#line 163 "_LibraryInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	sidebar_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		return;
-#line 173 "_LibraryInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	events_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		return;
-#line 183 "_LibraryInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	tags_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		return;
-#line 193 "_LibraryInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	camera_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		return;
-#line 203 "_LibraryInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	searches_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		return;
-#line 213 "_LibraryInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	data_imports_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		return;
-#line 223 "_LibraryInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	folders_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		return;
-#line 233 "_LibraryInternals.c"
-	}
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	library_init (&_inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		return;
-#line 243 "_LibraryInternals.c"
-	}
-}
-
-
-void
-library_terminate_entry (void)
-{
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	_tmp1_ = library__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	if (_tmp1_ == 0) {
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		_tmp0_ = TRUE;
-#line 259 "_LibraryInternals.c"
-	} else {
-		gint _tmp2_;
-		gint _tmp3_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		_tmp2_ = library__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		library__unit_init_count = _tmp2_ - 1;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		_tmp3_ = library__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-		_tmp0_ = _tmp3_ != 0;
-#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 277 "_LibraryInternals.c"
-	}
-#line 26 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	library_terminate ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	unit_terminate_entry ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	util_terminate_entry ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	threads_terminate_entry ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	db_terminate_entry ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	plugins_terminate_entry ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	slideshow_terminate_entry ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	photos_terminate_entry ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	publishing_terminate_entry ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	core_terminate_entry ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	sidebar_terminate_entry ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	events_terminate_entry ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	tags_terminate_entry ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	camera_terminate_entry ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	searches_terminate_entry ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	data_imports_terminate_entry ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
-	folders_terminate_entry ();
-#line 313 "_LibraryInternals.c"
-}
-
-
-
diff --git a/src/.unitize/_Library_unitize_entry.c b/src/.unitize/_Library_unitize_entry.c
deleted file mode 100644
index a0172d9..0000000
--- a/src/.unitize/_Library_unitize_entry.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* _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.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- *
- * Auto-generated file.  Do not modify!
- */
-
-
-#include <glib.h>
-#include <glib-object.h>
-
-
-
-
-void library_app_init (GError** error);
-void library_init_entry (GError** error);
-void library_app_terminate (void);
-void library_terminate_entry (void);
-
-
-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_);
-#line 12 "/home/jens/Source/shotwell/src/.unitize/_Library_unitize_entry.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12 "/home/jens/Source/shotwell/src/.unitize/_Library_unitize_entry.vala"
-		g_propagate_error (error, _inner_error_);
-#line 12 "/home/jens/Source/shotwell/src/.unitize/_Library_unitize_entry.vala"
-		return;
-#line 38 "_Library_unitize_entry.c"
-	}
-}
-
-
-void
-library_app_terminate (void)
-{
-#line 16 "/home/jens/Source/shotwell/src/.unitize/_Library_unitize_entry.vala"
-	library_terminate_entry ();
-#line 48 "_Library_unitize_entry.c"
-}
-
-
-
diff --git a/src/.unitize/_PhotosInternals.c b/src/.unitize/_PhotosInternals.c
deleted file mode 100644
index 8a32cae..0000000
--- a/src/.unitize/_PhotosInternals.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* _PhotosInternals.c generated by valac 0.40.4, the Vala compiler
- * generated from _PhotosInternals.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- *
- * Auto-generated file.  Do not modify!
- */
-
-
-#include <glib.h>
-#include <glib-object.h>
-
-
-
-extern gint photos__unit_init_count;
-gint photos__unit_init_count = 0;
-
-void photos_init_entry (GError** error);
-void unit_init_entry (GError** error);
-void photos_init (GError** error);
-void photos_terminate_entry (void);
-void photos_terminate (void);
-void unit_terminate_entry (void);
-
-
-void
-photos_init_entry (GError** error)
-{
-	gint _tmp0_;
-	GError * _inner_error_ = NULL;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
-	_tmp0_ = photos__unit_init_count;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
-	photos__unit_init_count = _tmp0_ + 1;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
-	if (_tmp0_ != 0) {
-#line 15 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
-		return;
-#line 43 "_PhotosInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
-	unit_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
-		return;
-#line 53 "_PhotosInternals.c"
-	}
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
-	photos_init (&_inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
-		return;
-#line 63 "_PhotosInternals.c"
-	}
-}
-
-
-void
-photos_terminate_entry (void)
-{
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
-	_tmp1_ = photos__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
-	if (_tmp1_ == 0) {
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
-		_tmp0_ = TRUE;
-#line 79 "_PhotosInternals.c"
-	} else {
-		gint _tmp2_;
-		gint _tmp3_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
-		_tmp2_ = photos__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
-		photos__unit_init_count = _tmp2_ - 1;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
-		_tmp3_ = photos__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
-		_tmp0_ = _tmp3_ != 0;
-#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 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 103 "_PhotosInternals.c"
-}
-
-
-
diff --git a/src/.unitize/_PluginsInternals.c b/src/.unitize/_PluginsInternals.c
deleted file mode 100644
index 350ca1d..0000000
--- a/src/.unitize/_PluginsInternals.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/* _PluginsInternals.c generated by valac 0.40.4, the Vala compiler
- * generated from _PluginsInternals.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- *
- * Auto-generated file.  Do not modify!
- */
-
-
-#include <glib.h>
-#include <glib-object.h>
-
-
-
-extern gint plugins__unit_init_count;
-gint plugins__unit_init_count = 0;
-
-void plugins_init_entry (GError** error);
-void unit_init_entry (GError** error);
-void util_init_entry (GError** error);
-void plugins_init (GError** error);
-void plugins_terminate_entry (void);
-void plugins_terminate (void);
-void unit_terminate_entry (void);
-void util_terminate_entry (void);
-
-
-void
-plugins_init_entry (GError** error)
-{
-	gint _tmp0_;
-	GError * _inner_error_ = NULL;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
-	_tmp0_ = plugins__unit_init_count;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
-	plugins__unit_init_count = _tmp0_ + 1;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
-	if (_tmp0_ != 0) {
-#line 15 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
-		return;
-#line 45 "_PluginsInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
-	unit_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
-		return;
-#line 55 "_PluginsInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
-	util_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
-		return;
-#line 65 "_PluginsInternals.c"
-	}
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
-	plugins_init (&_inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
-		return;
-#line 75 "_PluginsInternals.c"
-	}
-}
-
-
-void
-plugins_terminate_entry (void)
-{
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
-	_tmp1_ = plugins__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
-	if (_tmp1_ == 0) {
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
-		_tmp0_ = TRUE;
-#line 91 "_PluginsInternals.c"
-	} else {
-		gint _tmp2_;
-		gint _tmp3_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
-		_tmp2_ = plugins__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
-		plugins__unit_init_count = _tmp2_ - 1;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
-		_tmp3_ = plugins__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
-		_tmp0_ = _tmp3_ != 0;
-#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 109 "_PluginsInternals.c"
-	}
-#line 26 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
-	plugins_terminate ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
-	unit_terminate_entry ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
-	util_terminate_entry ();
-#line 117 "_PluginsInternals.c"
-}
-
-
-
diff --git a/src/.unitize/_PublishingInternals.c b/src/.unitize/_PublishingInternals.c
deleted file mode 100644
index df50c67..0000000
--- a/src/.unitize/_PublishingInternals.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/* _PublishingInternals.c generated by valac 0.40.4, the Vala compiler
- * generated from _PublishingInternals.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- *
- * Auto-generated file.  Do not modify!
- */
-
-
-#include <glib.h>
-#include <glib-object.h>
-
-
-
-extern gint publishing__unit_init_count;
-gint publishing__unit_init_count = 0;
-
-void publishing_init_entry (GError** error);
-void unit_init_entry (GError** error);
-void plugins_init_entry (GError** error);
-void publishing_init (GError** error);
-void publishing_terminate_entry (void);
-void publishing_terminate (void);
-void unit_terminate_entry (void);
-void plugins_terminate_entry (void);
-
-
-void
-publishing_init_entry (GError** error)
-{
-	gint _tmp0_;
-	GError * _inner_error_ = NULL;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
-	_tmp0_ = publishing__unit_init_count;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
-	publishing__unit_init_count = _tmp0_ + 1;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
-	if (_tmp0_ != 0) {
-#line 15 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
-		return;
-#line 45 "_PublishingInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
-	unit_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
-		return;
-#line 55 "_PublishingInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
-	plugins_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
-		return;
-#line 65 "_PublishingInternals.c"
-	}
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
-	publishing_init (&_inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
-		return;
-#line 75 "_PublishingInternals.c"
-	}
-}
-
-
-void
-publishing_terminate_entry (void)
-{
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
-	_tmp1_ = publishing__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
-	if (_tmp1_ == 0) {
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
-		_tmp0_ = TRUE;
-#line 91 "_PublishingInternals.c"
-	} else {
-		gint _tmp2_;
-		gint _tmp3_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
-		_tmp2_ = publishing__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
-		publishing__unit_init_count = _tmp2_ - 1;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
-		_tmp3_ = publishing__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
-		_tmp0_ = _tmp3_ != 0;
-#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 109 "_PublishingInternals.c"
-	}
-#line 26 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
-	publishing_terminate ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
-	unit_terminate_entry ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
-	plugins_terminate_entry ();
-#line 117 "_PublishingInternals.c"
-}
-
-
-
diff --git a/src/.unitize/_SearchesInternals.c b/src/.unitize/_SearchesInternals.c
deleted file mode 100644
index c630aff..0000000
--- a/src/.unitize/_SearchesInternals.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* _SearchesInternals.c generated by valac 0.40.4, the Vala compiler
- * generated from _SearchesInternals.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- *
- * Auto-generated file.  Do not modify!
- */
-
-
-#include <glib.h>
-#include <glib-object.h>
-
-
-
-extern gint searches__unit_init_count;
-gint searches__unit_init_count = 0;
-
-void searches_init_entry (GError** error);
-void unit_init_entry (GError** error);
-void searches_init (GError** error);
-void searches_terminate_entry (void);
-void searches_terminate (void);
-void unit_terminate_entry (void);
-
-
-void
-searches_init_entry (GError** error)
-{
-	gint _tmp0_;
-	GError * _inner_error_ = NULL;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
-	_tmp0_ = searches__unit_init_count;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
-	searches__unit_init_count = _tmp0_ + 1;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
-	if (_tmp0_ != 0) {
-#line 15 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
-		return;
-#line 43 "_SearchesInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
-	unit_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
-		return;
-#line 53 "_SearchesInternals.c"
-	}
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
-	searches_init (&_inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
-		return;
-#line 63 "_SearchesInternals.c"
-	}
-}
-
-
-void
-searches_terminate_entry (void)
-{
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
-	_tmp1_ = searches__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
-	if (_tmp1_ == 0) {
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
-		_tmp0_ = TRUE;
-#line 79 "_SearchesInternals.c"
-	} else {
-		gint _tmp2_;
-		gint _tmp3_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
-		_tmp2_ = searches__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
-		searches__unit_init_count = _tmp2_ - 1;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
-		_tmp3_ = searches__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
-		_tmp0_ = _tmp3_ != 0;
-#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 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 103 "_SearchesInternals.c"
-}
-
-
-
diff --git a/src/.unitize/_SidebarInternals.c b/src/.unitize/_SidebarInternals.c
deleted file mode 100644
index 6ea5d4e..0000000
--- a/src/.unitize/_SidebarInternals.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* _SidebarInternals.c generated by valac 0.40.4, the Vala compiler
- * generated from _SidebarInternals.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- *
- * Auto-generated file.  Do not modify!
- */
-
-
-#include <glib.h>
-#include <glib-object.h>
-
-
-
-extern gint sidebar__unit_init_count;
-gint sidebar__unit_init_count = 0;
-
-void sidebar_init_entry (GError** error);
-void unit_init_entry (GError** error);
-void sidebar_init (GError** error);
-void sidebar_terminate_entry (void);
-void sidebar_terminate (void);
-void unit_terminate_entry (void);
-
-
-void
-sidebar_init_entry (GError** error)
-{
-	gint _tmp0_;
-	GError * _inner_error_ = NULL;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
-	_tmp0_ = sidebar__unit_init_count;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
-	sidebar__unit_init_count = _tmp0_ + 1;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
-	if (_tmp0_ != 0) {
-#line 15 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
-		return;
-#line 43 "_SidebarInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
-	unit_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
-		return;
-#line 53 "_SidebarInternals.c"
-	}
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
-	sidebar_init (&_inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
-		return;
-#line 63 "_SidebarInternals.c"
-	}
-}
-
-
-void
-sidebar_terminate_entry (void)
-{
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
-	_tmp1_ = sidebar__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
-	if (_tmp1_ == 0) {
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
-		_tmp0_ = TRUE;
-#line 79 "_SidebarInternals.c"
-	} else {
-		gint _tmp2_;
-		gint _tmp3_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
-		_tmp2_ = sidebar__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
-		sidebar__unit_init_count = _tmp2_ - 1;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
-		_tmp3_ = sidebar__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
-		_tmp0_ = _tmp3_ != 0;
-#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 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 103 "_SidebarInternals.c"
-}
-
-
-
diff --git a/src/.unitize/_SlideshowInternals.c b/src/.unitize/_SlideshowInternals.c
deleted file mode 100644
index 1fc0686..0000000
--- a/src/.unitize/_SlideshowInternals.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/* _SlideshowInternals.c generated by valac 0.40.4, the Vala compiler
- * generated from _SlideshowInternals.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- *
- * Auto-generated file.  Do not modify!
- */
-
-
-#include <glib.h>
-#include <glib-object.h>
-
-
-
-extern gint slideshow__unit_init_count;
-gint slideshow__unit_init_count = 0;
-
-void slideshow_init_entry (GError** error);
-void unit_init_entry (GError** error);
-void plugins_init_entry (GError** error);
-void slideshow_init (GError** error);
-void slideshow_terminate_entry (void);
-void slideshow_terminate (void);
-void unit_terminate_entry (void);
-void plugins_terminate_entry (void);
-
-
-void
-slideshow_init_entry (GError** error)
-{
-	gint _tmp0_;
-	GError * _inner_error_ = NULL;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
-	_tmp0_ = slideshow__unit_init_count;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
-	slideshow__unit_init_count = _tmp0_ + 1;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
-	if (_tmp0_ != 0) {
-#line 15 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
-		return;
-#line 45 "_SlideshowInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
-	unit_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
-		return;
-#line 55 "_SlideshowInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
-	plugins_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
-		return;
-#line 65 "_SlideshowInternals.c"
-	}
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
-	slideshow_init (&_inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
-		return;
-#line 75 "_SlideshowInternals.c"
-	}
-}
-
-
-void
-slideshow_terminate_entry (void)
-{
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
-	_tmp1_ = slideshow__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
-	if (_tmp1_ == 0) {
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
-		_tmp0_ = TRUE;
-#line 91 "_SlideshowInternals.c"
-	} else {
-		gint _tmp2_;
-		gint _tmp3_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
-		_tmp2_ = slideshow__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
-		slideshow__unit_init_count = _tmp2_ - 1;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
-		_tmp3_ = slideshow__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
-		_tmp0_ = _tmp3_ != 0;
-#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 109 "_SlideshowInternals.c"
-	}
-#line 26 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
-	slideshow_terminate ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
-	unit_terminate_entry ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
-	plugins_terminate_entry ();
-#line 117 "_SlideshowInternals.c"
-}
-
-
-
diff --git a/src/.unitize/_TagsInternals.c b/src/.unitize/_TagsInternals.c
deleted file mode 100644
index 0383b23..0000000
--- a/src/.unitize/_TagsInternals.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/* _TagsInternals.c generated by valac 0.40.4, the Vala compiler
- * generated from _TagsInternals.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- *
- * Auto-generated file.  Do not modify!
- */
-
-
-#include <glib.h>
-#include <glib-object.h>
-
-
-
-extern gint tags__unit_init_count;
-gint tags__unit_init_count = 0;
-
-void tags_init_entry (GError** error);
-void unit_init_entry (GError** error);
-void sidebar_init_entry (GError** error);
-void tags_init (GError** error);
-void tags_terminate_entry (void);
-void tags_terminate (void);
-void unit_terminate_entry (void);
-void sidebar_terminate_entry (void);
-
-
-void
-tags_init_entry (GError** error)
-{
-	gint _tmp0_;
-	GError * _inner_error_ = NULL;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
-	_tmp0_ = tags__unit_init_count;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
-	tags__unit_init_count = _tmp0_ + 1;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
-	if (_tmp0_ != 0) {
-#line 15 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
-		return;
-#line 45 "_TagsInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
-	unit_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
-		return;
-#line 55 "_TagsInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
-	sidebar_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
-		return;
-#line 65 "_TagsInternals.c"
-	}
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
-	tags_init (&_inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
-		return;
-#line 75 "_TagsInternals.c"
-	}
-}
-
-
-void
-tags_terminate_entry (void)
-{
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
-	_tmp1_ = tags__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
-	if (_tmp1_ == 0) {
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
-		_tmp0_ = TRUE;
-#line 91 "_TagsInternals.c"
-	} else {
-		gint _tmp2_;
-		gint _tmp3_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
-		_tmp2_ = tags__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
-		tags__unit_init_count = _tmp2_ - 1;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
-		_tmp3_ = tags__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
-		_tmp0_ = _tmp3_ != 0;
-#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 109 "_TagsInternals.c"
-	}
-#line 26 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
-	tags_terminate ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
-	unit_terminate_entry ();
-#line 28 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
-	sidebar_terminate_entry ();
-#line 117 "_TagsInternals.c"
-}
-
-
-
diff --git a/src/.unitize/_ThreadsInternals.c b/src/.unitize/_ThreadsInternals.c
deleted file mode 100644
index db67d9d..0000000
--- a/src/.unitize/_ThreadsInternals.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* _ThreadsInternals.c generated by valac 0.40.4, the Vala compiler
- * generated from _ThreadsInternals.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- *
- * Auto-generated file.  Do not modify!
- */
-
-
-#include <glib.h>
-#include <glib-object.h>
-
-
-
-extern gint threads__unit_init_count;
-gint threads__unit_init_count = 0;
-
-void threads_init_entry (GError** error);
-void unit_init_entry (GError** error);
-void threads_init (GError** error);
-void threads_terminate_entry (void);
-void threads_terminate (void);
-void unit_terminate_entry (void);
-
-
-void
-threads_init_entry (GError** error)
-{
-	gint _tmp0_;
-	GError * _inner_error_ = NULL;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
-	_tmp0_ = threads__unit_init_count;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
-	threads__unit_init_count = _tmp0_ + 1;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
-	if (_tmp0_ != 0) {
-#line 15 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
-		return;
-#line 43 "_ThreadsInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
-	unit_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
-		return;
-#line 53 "_ThreadsInternals.c"
-	}
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
-	threads_init (&_inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
-		return;
-#line 63 "_ThreadsInternals.c"
-	}
-}
-
-
-void
-threads_terminate_entry (void)
-{
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
-	_tmp1_ = threads__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
-	if (_tmp1_ == 0) {
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
-		_tmp0_ = TRUE;
-#line 79 "_ThreadsInternals.c"
-	} else {
-		gint _tmp2_;
-		gint _tmp3_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
-		_tmp2_ = threads__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
-		threads__unit_init_count = _tmp2_ - 1;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
-		_tmp3_ = threads__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
-		_tmp0_ = _tmp3_ != 0;
-#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 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 103 "_ThreadsInternals.c"
-}
-
-
-
diff --git a/src/.unitize/_UnitInternals.c b/src/.unitize/_UnitInternals.c
deleted file mode 100644
index 998da34..0000000
--- a/src/.unitize/_UnitInternals.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/* _UnitInternals.c generated by valac 0.40.4, the Vala compiler
- * generated from _UnitInternals.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- *
- * Auto-generated file.  Do not modify!
- */
-
-
-#include <glib.h>
-#include <glib-object.h>
-
-
-
-extern gint unit__unit_init_count;
-gint unit__unit_init_count = 0;
-
-void unit_init_entry (GError** error);
-void unit_init (GError** error);
-void unit_terminate_entry (void);
-void unit_terminate (void);
-
-
-void
-unit_init_entry (GError** error)
-{
-	gint _tmp0_;
-	GError * _inner_error_ = NULL;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
-	_tmp0_ = unit__unit_init_count;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
-	unit__unit_init_count = _tmp0_ + 1;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
-	if (_tmp0_ != 0) {
-#line 15 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
-		return;
-#line 41 "_UnitInternals.c"
-	}
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
-	unit_init (&_inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
-		return;
-#line 51 "_UnitInternals.c"
-	}
-}
-
-
-void
-unit_terminate_entry (void)
-{
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
-	_tmp1_ = unit__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
-	if (_tmp1_ == 0) {
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
-		_tmp0_ = TRUE;
-#line 67 "_UnitInternals.c"
-	} else {
-		gint _tmp2_;
-		gint _tmp3_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
-		_tmp2_ = unit__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
-		unit__unit_init_count = _tmp2_ - 1;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
-		_tmp3_ = unit__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
-		_tmp0_ = _tmp3_ != 0;
-#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 85 "_UnitInternals.c"
-	}
-#line 26 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
-	unit_terminate ();
-#line 89 "_UnitInternals.c"
-}
-
-
-
diff --git a/src/.unitize/_UtilInternals.c b/src/.unitize/_UtilInternals.c
deleted file mode 100644
index c52fbcd..0000000
--- a/src/.unitize/_UtilInternals.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* _UtilInternals.c generated by valac 0.40.4, the Vala compiler
- * generated from _UtilInternals.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- *
- * Auto-generated file.  Do not modify!
- */
-
-
-#include <glib.h>
-#include <glib-object.h>
-
-
-
-extern gint util__unit_init_count;
-gint util__unit_init_count = 0;
-
-void util_init_entry (GError** error);
-void unit_init_entry (GError** error);
-void util_init (GError** error);
-void util_terminate_entry (void);
-void util_terminate (void);
-void unit_terminate_entry (void);
-
-
-void
-util_init_entry (GError** error)
-{
-	gint _tmp0_;
-	GError * _inner_error_ = NULL;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
-	_tmp0_ = util__unit_init_count;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
-	util__unit_init_count = _tmp0_ + 1;
-#line 14 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
-	if (_tmp0_ != 0) {
-#line 15 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
-		return;
-#line 43 "_UtilInternals.c"
-	}
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
-	unit_init_entry (&_inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 17 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
-		return;
-#line 53 "_UtilInternals.c"
-	}
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
-	util_init (&_inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
-		g_propagate_error (error, _inner_error_);
-#line 19 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
-		return;
-#line 63 "_UtilInternals.c"
-	}
-}
-
-
-void
-util_terminate_entry (void)
-{
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
-	_tmp1_ = util__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
-	if (_tmp1_ == 0) {
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
-		_tmp0_ = TRUE;
-#line 79 "_UtilInternals.c"
-	} else {
-		gint _tmp2_;
-		gint _tmp3_;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
-		_tmp2_ = util__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
-		util__unit_init_count = _tmp2_ - 1;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
-		_tmp3_ = util__unit_init_count;
-#line 23 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
-		_tmp0_ = _tmp3_ != 0;
-#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 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 103 "_UtilInternals.c"
-}
-
-
-