Merge branch 'release/0.26.4-1'0.26.4-1

22 files changed, 102 insertions, 102 deletions

diff --git a/src/.unitize/_CameraInternals.c b/src/.unitize/_CameraInternals.c
index c7ab887..b1bd5f0 100644
--- a/src/.unitize/_CameraInternals.c
+++ b/src/.unitize/_CameraInternals.c
@@ -1,4 +1,4 @@
-/* _CameraInternals.c generated by valac 0.34.7, the Vala compiler
+/* _CameraInternals.c generated by valac 0.36.6, the Vala compiler
  * generated from _CameraInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -28,7 +28,7 @@ void sidebar_terminate_entry (void);
 
 
 void camera_init_entry (GError** error) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
 	_tmp0_ = camera__unit_init_count;
@@ -75,7 +75,7 @@ void camera_init_entry (GError** error) {
 
 void camera_terminate_entry (void) {
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
+	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"
@@ -84,8 +84,8 @@ void camera_terminate_entry (void) {
 		_tmp0_ = TRUE;
 #line 86 "_CameraInternals.c"
 	} else {
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
+		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"
diff --git a/src/.unitize/_ConfigInternals.c b/src/.unitize/_ConfigInternals.c
index d0acc18..0048c54 100644
--- a/src/.unitize/_ConfigInternals.c
+++ b/src/.unitize/_ConfigInternals.c
@@ -1,4 +1,4 @@
-/* _ConfigInternals.c generated by valac 0.34.7, the Vala compiler
+/* _ConfigInternals.c generated by valac 0.36.6, the Vala compiler
  * generated from _ConfigInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -26,7 +26,7 @@ void unit_terminate_entry (void);
 
 
 void config_init_entry (GError** error) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
 	_tmp0_ = config__unit_init_count;
@@ -63,7 +63,7 @@ void config_init_entry (GError** error) {
 
 void config_terminate_entry (void) {
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
+	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"
@@ -72,8 +72,8 @@ void config_terminate_entry (void) {
 		_tmp0_ = TRUE;
 #line 74 "_ConfigInternals.c"
 	} else {
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
+		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"
diff --git a/src/.unitize/_CoreInternals.c b/src/.unitize/_CoreInternals.c
index 309e707..785036d 100644
--- a/src/.unitize/_CoreInternals.c
+++ b/src/.unitize/_CoreInternals.c
@@ -1,4 +1,4 @@
-/* _CoreInternals.c generated by valac 0.34.7, the Vala compiler
+/* _CoreInternals.c generated by valac 0.36.6, the Vala compiler
  * generated from _CoreInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -26,7 +26,7 @@ void unit_terminate_entry (void);
 
 
 void core_init_entry (GError** error) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
 	_tmp0_ = core__unit_init_count;
@@ -63,7 +63,7 @@ void core_init_entry (GError** error) {
 
 void core_terminate_entry (void) {
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
+	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"
@@ -72,8 +72,8 @@ void core_terminate_entry (void) {
 		_tmp0_ = TRUE;
 #line 74 "_CoreInternals.c"
 	} else {
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
+		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"
diff --git a/src/.unitize/_DataImportsInternals.c b/src/.unitize/_DataImportsInternals.c
index 2dd8bb3..6f25bbf 100644
--- a/src/.unitize/_DataImportsInternals.c
+++ b/src/.unitize/_DataImportsInternals.c
@@ -1,4 +1,4 @@
-/* _DataImportsInternals.c generated by valac 0.34.7, the Vala compiler
+/* _DataImportsInternals.c generated by valac 0.36.6, the Vala compiler
  * generated from _DataImportsInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -26,7 +26,7 @@ void unit_terminate_entry (void);
 
 
 void data_imports_init_entry (GError** error) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
 	_tmp0_ = data_imports__unit_init_count;
@@ -63,7 +63,7 @@ void data_imports_init_entry (GError** error) {
 
 void data_imports_terminate_entry (void) {
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
+	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"
@@ -72,8 +72,8 @@ void data_imports_terminate_entry (void) {
 		_tmp0_ = TRUE;
 #line 74 "_DataImportsInternals.c"
 	} else {
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
+		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"
diff --git a/src/.unitize/_DbInternals.c b/src/.unitize/_DbInternals.c
index abad513..842d484 100644
--- a/src/.unitize/_DbInternals.c
+++ b/src/.unitize/_DbInternals.c
@@ -1,4 +1,4 @@
-/* _DbInternals.c generated by valac 0.34.7, the Vala compiler
+/* _DbInternals.c generated by valac 0.36.6, the Vala compiler
  * generated from _DbInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -26,7 +26,7 @@ void unit_terminate_entry (void);
 
 
 void db_init_entry (GError** error) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
 	_tmp0_ = db__unit_init_count;
@@ -63,7 +63,7 @@ void db_init_entry (GError** error) {
 
 void db_terminate_entry (void) {
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
+	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"
@@ -72,8 +72,8 @@ void db_terminate_entry (void) {
 		_tmp0_ = TRUE;
 #line 74 "_DbInternals.c"
 	} else {
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
+		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"
diff --git a/src/.unitize/_DirectInternals.c b/src/.unitize/_DirectInternals.c
index 466afe5..1031b9a 100644
--- a/src/.unitize/_DirectInternals.c
+++ b/src/.unitize/_DirectInternals.c
@@ -1,4 +1,4 @@
-/* _DirectInternals.c generated by valac 0.34.7, the Vala compiler
+/* _DirectInternals.c generated by valac 0.36.6, the Vala compiler
  * generated from _DirectInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -36,7 +36,7 @@ void core_terminate_entry (void);
 
 
 void direct_init_entry (GError** error) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 	_tmp0_ = direct__unit_init_count;
@@ -123,7 +123,7 @@ void direct_init_entry (GError** error) {
 
 void direct_terminate_entry (void) {
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
+	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"
@@ -132,8 +132,8 @@ void direct_terminate_entry (void) {
 		_tmp0_ = TRUE;
 #line 134 "_DirectInternals.c"
 	} else {
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
+		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"
diff --git a/src/.unitize/_Direct_unitize_entry.c b/src/.unitize/_Direct_unitize_entry.c
index c4a3249..fcfc55a 100644
--- a/src/.unitize/_Direct_unitize_entry.c
+++ b/src/.unitize/_Direct_unitize_entry.c
@@ -1,4 +1,4 @@
-/* _Direct_unitize_entry.c generated by valac 0.34.7, the Vala compiler
+/* _Direct_unitize_entry.c generated by valac 0.36.6, the Vala compiler
  * generated from _Direct_unitize_entry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_EditingToolsInternals.c b/src/.unitize/_EditingToolsInternals.c
index 85aa7f5..29ec24b 100644
--- a/src/.unitize/_EditingToolsInternals.c
+++ b/src/.unitize/_EditingToolsInternals.c
@@ -1,4 +1,4 @@
-/* _EditingToolsInternals.c generated by valac 0.34.7, the Vala compiler
+/* _EditingToolsInternals.c generated by valac 0.36.6, the Vala compiler
  * generated from _EditingToolsInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -26,7 +26,7 @@ void unit_terminate_entry (void);
 
 
 void editing_tools_init_entry (GError** error) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
 	_tmp0_ = editing_tools__unit_init_count;
@@ -63,7 +63,7 @@ void editing_tools_init_entry (GError** error) {
 
 void editing_tools_terminate_entry (void) {
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
+	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"
@@ -72,8 +72,8 @@ void editing_tools_terminate_entry (void) {
 		_tmp0_ = TRUE;
 #line 74 "_EditingToolsInternals.c"
 	} else {
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
+		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"
diff --git a/src/.unitize/_EventsInternals.c b/src/.unitize/_EventsInternals.c
index 01acadf..8ee5b0b 100644
--- a/src/.unitize/_EventsInternals.c
+++ b/src/.unitize/_EventsInternals.c
@@ -1,4 +1,4 @@
-/* _EventsInternals.c generated by valac 0.34.7, the Vala compiler
+/* _EventsInternals.c generated by valac 0.36.6, the Vala compiler
  * generated from _EventsInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -28,7 +28,7 @@ void sidebar_terminate_entry (void);
 
 
 void events_init_entry (GError** error) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
 	_tmp0_ = events__unit_init_count;
@@ -75,7 +75,7 @@ void events_init_entry (GError** error) {
 
 void events_terminate_entry (void) {
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
+	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"
@@ -84,8 +84,8 @@ void events_terminate_entry (void) {
 		_tmp0_ = TRUE;
 #line 86 "_EventsInternals.c"
 	} else {
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
+		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"
diff --git a/src/.unitize/_FoldersInternals.c b/src/.unitize/_FoldersInternals.c
index cb111ea..3e32a79 100644
--- a/src/.unitize/_FoldersInternals.c
+++ b/src/.unitize/_FoldersInternals.c
@@ -1,4 +1,4 @@
-/* _FoldersInternals.c generated by valac 0.34.7, the Vala compiler
+/* _FoldersInternals.c generated by valac 0.36.6, the Vala compiler
  * generated from _FoldersInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -30,7 +30,7 @@ void photos_terminate_entry (void);
 
 
 void folders_init_entry (GError** error) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
 	_tmp0_ = folders__unit_init_count;
@@ -87,7 +87,7 @@ void folders_init_entry (GError** error) {
 
 void folders_terminate_entry (void) {
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
+	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"
@@ -96,8 +96,8 @@ void folders_terminate_entry (void) {
 		_tmp0_ = TRUE;
 #line 98 "_FoldersInternals.c"
 	} else {
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
+		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"
diff --git a/src/.unitize/_LibraryInternals.c b/src/.unitize/_LibraryInternals.c
index 4d9519e..fd91e7b 100644
--- a/src/.unitize/_LibraryInternals.c
+++ b/src/.unitize/_LibraryInternals.c
@@ -1,4 +1,4 @@
-/* _LibraryInternals.c generated by valac 0.34.7, the Vala compiler
+/* _LibraryInternals.c generated by valac 0.36.6, the Vala compiler
  * generated from _LibraryInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -56,7 +56,7 @@ void folders_terminate_entry (void);
 
 
 void library_init_entry (GError** error) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	_tmp0_ = library__unit_init_count;
@@ -243,7 +243,7 @@ void library_init_entry (GError** error) {
 
 void library_terminate_entry (void) {
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
+	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"
@@ -252,8 +252,8 @@ void library_terminate_entry (void) {
 		_tmp0_ = TRUE;
 #line 254 "_LibraryInternals.c"
 	} else {
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
+		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"
diff --git a/src/.unitize/_Library_unitize_entry.c b/src/.unitize/_Library_unitize_entry.c
index 6159421..21c9b1c 100644
--- a/src/.unitize/_Library_unitize_entry.c
+++ b/src/.unitize/_Library_unitize_entry.c
@@ -1,4 +1,4 @@
-/* _Library_unitize_entry.c generated by valac 0.34.7, the Vala compiler
+/* _Library_unitize_entry.c generated by valac 0.36.6, the Vala compiler
  * generated from _Library_unitize_entry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_PhotosInternals.c b/src/.unitize/_PhotosInternals.c
index dee0ffc..0b0b1a0 100644
--- a/src/.unitize/_PhotosInternals.c
+++ b/src/.unitize/_PhotosInternals.c
@@ -1,4 +1,4 @@
-/* _PhotosInternals.c generated by valac 0.34.7, the Vala compiler
+/* _PhotosInternals.c generated by valac 0.36.6, the Vala compiler
  * generated from _PhotosInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -26,7 +26,7 @@ void unit_terminate_entry (void);
 
 
 void photos_init_entry (GError** error) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
 	_tmp0_ = photos__unit_init_count;
@@ -63,7 +63,7 @@ void photos_init_entry (GError** error) {
 
 void photos_terminate_entry (void) {
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
+	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"
@@ -72,8 +72,8 @@ void photos_terminate_entry (void) {
 		_tmp0_ = TRUE;
 #line 74 "_PhotosInternals.c"
 	} else {
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
+		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"
diff --git a/src/.unitize/_PluginsInternals.c b/src/.unitize/_PluginsInternals.c
index 35345fb..f5f81a8 100644
--- a/src/.unitize/_PluginsInternals.c
+++ b/src/.unitize/_PluginsInternals.c
@@ -1,4 +1,4 @@
-/* _PluginsInternals.c generated by valac 0.34.7, the Vala compiler
+/* _PluginsInternals.c generated by valac 0.36.6, the Vala compiler
  * generated from _PluginsInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -28,7 +28,7 @@ void util_terminate_entry (void);
 
 
 void plugins_init_entry (GError** error) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
 	_tmp0_ = plugins__unit_init_count;
@@ -75,7 +75,7 @@ void plugins_init_entry (GError** error) {
 
 void plugins_terminate_entry (void) {
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
+	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"
@@ -84,8 +84,8 @@ void plugins_terminate_entry (void) {
 		_tmp0_ = TRUE;
 #line 86 "_PluginsInternals.c"
 	} else {
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
+		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"
diff --git a/src/.unitize/_PublishingInternals.c b/src/.unitize/_PublishingInternals.c
index 37a3b69..3a969ab 100644
--- a/src/.unitize/_PublishingInternals.c
+++ b/src/.unitize/_PublishingInternals.c
@@ -1,4 +1,4 @@
-/* _PublishingInternals.c generated by valac 0.34.7, the Vala compiler
+/* _PublishingInternals.c generated by valac 0.36.6, the Vala compiler
  * generated from _PublishingInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -28,7 +28,7 @@ void plugins_terminate_entry (void);
 
 
 void publishing_init_entry (GError** error) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
 	_tmp0_ = publishing__unit_init_count;
@@ -75,7 +75,7 @@ void publishing_init_entry (GError** error) {
 
 void publishing_terminate_entry (void) {
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
+	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"
@@ -84,8 +84,8 @@ void publishing_terminate_entry (void) {
 		_tmp0_ = TRUE;
 #line 86 "_PublishingInternals.c"
 	} else {
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
+		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"
diff --git a/src/.unitize/_SearchesInternals.c b/src/.unitize/_SearchesInternals.c
index 4e0d477..9b323db 100644
--- a/src/.unitize/_SearchesInternals.c
+++ b/src/.unitize/_SearchesInternals.c
@@ -1,4 +1,4 @@
-/* _SearchesInternals.c generated by valac 0.34.7, the Vala compiler
+/* _SearchesInternals.c generated by valac 0.36.6, the Vala compiler
  * generated from _SearchesInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -26,7 +26,7 @@ void unit_terminate_entry (void);
 
 
 void searches_init_entry (GError** error) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
 	_tmp0_ = searches__unit_init_count;
@@ -63,7 +63,7 @@ void searches_init_entry (GError** error) {
 
 void searches_terminate_entry (void) {
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
+	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"
@@ -72,8 +72,8 @@ void searches_terminate_entry (void) {
 		_tmp0_ = TRUE;
 #line 74 "_SearchesInternals.c"
 	} else {
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
+		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"
diff --git a/src/.unitize/_SidebarInternals.c b/src/.unitize/_SidebarInternals.c
index b9ed3c9..19c5e4d 100644
--- a/src/.unitize/_SidebarInternals.c
+++ b/src/.unitize/_SidebarInternals.c
@@ -1,4 +1,4 @@
-/* _SidebarInternals.c generated by valac 0.34.7, the Vala compiler
+/* _SidebarInternals.c generated by valac 0.36.6, the Vala compiler
  * generated from _SidebarInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -26,7 +26,7 @@ void unit_terminate_entry (void);
 
 
 void sidebar_init_entry (GError** error) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
 	_tmp0_ = sidebar__unit_init_count;
@@ -63,7 +63,7 @@ void sidebar_init_entry (GError** error) {
 
 void sidebar_terminate_entry (void) {
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
+	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"
@@ -72,8 +72,8 @@ void sidebar_terminate_entry (void) {
 		_tmp0_ = TRUE;
 #line 74 "_SidebarInternals.c"
 	} else {
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
+		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"
diff --git a/src/.unitize/_SlideshowInternals.c b/src/.unitize/_SlideshowInternals.c
index db6e8b8..3b924bb 100644
--- a/src/.unitize/_SlideshowInternals.c
+++ b/src/.unitize/_SlideshowInternals.c
@@ -1,4 +1,4 @@
-/* _SlideshowInternals.c generated by valac 0.34.7, the Vala compiler
+/* _SlideshowInternals.c generated by valac 0.36.6, the Vala compiler
  * generated from _SlideshowInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -28,7 +28,7 @@ void plugins_terminate_entry (void);
 
 
 void slideshow_init_entry (GError** error) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
 	_tmp0_ = slideshow__unit_init_count;
@@ -75,7 +75,7 @@ void slideshow_init_entry (GError** error) {
 
 void slideshow_terminate_entry (void) {
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
+	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"
@@ -84,8 +84,8 @@ void slideshow_terminate_entry (void) {
 		_tmp0_ = TRUE;
 #line 86 "_SlideshowInternals.c"
 	} else {
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
+		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"
diff --git a/src/.unitize/_TagsInternals.c b/src/.unitize/_TagsInternals.c
index e3ae9ae..a538593 100644
--- a/src/.unitize/_TagsInternals.c
+++ b/src/.unitize/_TagsInternals.c
@@ -1,4 +1,4 @@
-/* _TagsInternals.c generated by valac 0.34.7, the Vala compiler
+/* _TagsInternals.c generated by valac 0.36.6, the Vala compiler
  * generated from _TagsInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -28,7 +28,7 @@ void sidebar_terminate_entry (void);
 
 
 void tags_init_entry (GError** error) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
 	_tmp0_ = tags__unit_init_count;
@@ -75,7 +75,7 @@ void tags_init_entry (GError** error) {
 
 void tags_terminate_entry (void) {
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
+	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"
@@ -84,8 +84,8 @@ void tags_terminate_entry (void) {
 		_tmp0_ = TRUE;
 #line 86 "_TagsInternals.c"
 	} else {
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
+		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"
diff --git a/src/.unitize/_ThreadsInternals.c b/src/.unitize/_ThreadsInternals.c
index 5688530..f4bba14 100644
--- a/src/.unitize/_ThreadsInternals.c
+++ b/src/.unitize/_ThreadsInternals.c
@@ -1,4 +1,4 @@
-/* _ThreadsInternals.c generated by valac 0.34.7, the Vala compiler
+/* _ThreadsInternals.c generated by valac 0.36.6, the Vala compiler
  * generated from _ThreadsInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -26,7 +26,7 @@ void unit_terminate_entry (void);
 
 
 void threads_init_entry (GError** error) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
 	_tmp0_ = threads__unit_init_count;
@@ -63,7 +63,7 @@ void threads_init_entry (GError** error) {
 
 void threads_terminate_entry (void) {
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
+	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"
@@ -72,8 +72,8 @@ void threads_terminate_entry (void) {
 		_tmp0_ = TRUE;
 #line 74 "_ThreadsInternals.c"
 	} else {
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
+		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"
diff --git a/src/.unitize/_UnitInternals.c b/src/.unitize/_UnitInternals.c
index 1d4145e..ee8e879 100644
--- a/src/.unitize/_UnitInternals.c
+++ b/src/.unitize/_UnitInternals.c
@@ -1,4 +1,4 @@
-/* _UnitInternals.c generated by valac 0.34.7, the Vala compiler
+/* _UnitInternals.c generated by valac 0.36.6, the Vala compiler
  * generated from _UnitInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -24,7 +24,7 @@ void unit_terminate (void);
 
 
 void unit_init_entry (GError** error) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
 	_tmp0_ = unit__unit_init_count;
@@ -51,7 +51,7 @@ void unit_init_entry (GError** error) {
 
 void unit_terminate_entry (void) {
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
+	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"
@@ -60,8 +60,8 @@ void unit_terminate_entry (void) {
 		_tmp0_ = TRUE;
 #line 62 "_UnitInternals.c"
 	} else {
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
+		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"
diff --git a/src/.unitize/_UtilInternals.c b/src/.unitize/_UtilInternals.c
index be52964..628306b 100644
--- a/src/.unitize/_UtilInternals.c
+++ b/src/.unitize/_UtilInternals.c
@@ -1,4 +1,4 @@
-/* _UtilInternals.c generated by valac 0.34.7, the Vala compiler
+/* _UtilInternals.c generated by valac 0.36.6, the Vala compiler
  * generated from _UtilInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -26,7 +26,7 @@ void unit_terminate_entry (void);
 
 
 void util_init_entry (GError** error) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
 	_tmp0_ = util__unit_init_count;
@@ -63,7 +63,7 @@ void util_init_entry (GError** error) {
 
 void util_terminate_entry (void) {
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
+	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"
@@ -72,8 +72,8 @@ void util_terminate_entry (void) {
 		_tmp0_ = TRUE;
 #line 74 "_UtilInternals.c"
 	} else {
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
+		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"